From 98478964f2464170b228890602e8c30995013973 Mon Sep 17 00:00:00 2001 From: Bryson Steck Date: Wed, 16 Jun 2021 18:02:05 -0600 Subject: resurrect command should remove death --- .../Resurrection/player/PlayerListener.java | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) (limited to 'src/net/brysonsteck/Resurrection/player') diff --git a/src/net/brysonsteck/Resurrection/player/PlayerListener.java b/src/net/brysonsteck/Resurrection/player/PlayerListener.java index 026cf03..d4abcaa 100644 --- a/src/net/brysonsteck/Resurrection/player/PlayerListener.java +++ b/src/net/brysonsteck/Resurrection/player/PlayerListener.java @@ -37,11 +37,11 @@ public class PlayerListener implements Listener { boolean dead = Boolean.parseBoolean(playerSplit[1]); resurrectTime = Long.parseLong(playerSplit[2]); - if (p.getGameMode() == GameMode.SPECTATOR && !dead) { + if (!dead) { for (PotionEffect effect : p.getActivePotionEffects()) p.removePotionEffect(effect.getType()); p.setGameMode(GameMode.SURVIVAL); - } else if (p.getGameMode() == GameMode.SPECTATOR && dead) { + } else { resumeDeath = true; } @@ -57,14 +57,21 @@ public class PlayerListener implements Listener { playerData.saveData(rawData + ";" + p.getDisplayName() + ",false,0"); } if (resumeDeath) { - PotionEffect blindness = new PotionEffect(PotionEffectType.BLINDNESS, 999999999, 10, false); - PotionEffect slowness = new PotionEffect(PotionEffectType.SLOW, 999999999, 10, false); - blindness.apply(p); - slowness.apply(p); - // convert to seconds and to ticks + new BukkitRunnable() { + @Override + public void run() { + p.setGameMode(GameMode.SPECTATOR); + PotionEffect blindness = new PotionEffect(PotionEffectType.BLINDNESS, 999999999, 10, false); + PotionEffect slowness = new PotionEffect(PotionEffectType.SLOW, 999999999, 10, false); + blindness.apply(p); + slowness.apply(p); + // convert to seconds and to ticks + } + }.runTaskLater(JavaPlugin.getProvidingPlugin(Resurrection.class), 1); resurrectTime = resurrectTime - System.currentTimeMillis(); resurrectTime = resurrectTime / 1000; resurrectTime = resurrectTime * 20; + new BukkitRunnable() { @Override public void run() { -- cgit v1.2.3