diff options
-rw-r--r-- | out/artifacts/Resurrection_jar/Resurrection.jar | bin | 1335900 -> 1335783 bytes | |||
-rw-r--r-- | out/production/Resurrection/net/brysonsteck/Resurrection/PlayerListener.class | bin | 3402 -> 3031 bytes | |||
-rw-r--r-- | src/net/brysonsteck/Resurrection/PlayerListener.java | 13 |
3 files changed, 8 insertions, 5 deletions
diff --git a/out/artifacts/Resurrection_jar/Resurrection.jar b/out/artifacts/Resurrection_jar/Resurrection.jar Binary files differindex dc6854b..53c1768 100644 --- a/out/artifacts/Resurrection_jar/Resurrection.jar +++ b/out/artifacts/Resurrection_jar/Resurrection.jar diff --git a/out/production/Resurrection/net/brysonsteck/Resurrection/PlayerListener.class b/out/production/Resurrection/net/brysonsteck/Resurrection/PlayerListener.class Binary files differindex 63ceec4..17841e0 100644 --- a/out/production/Resurrection/net/brysonsteck/Resurrection/PlayerListener.class +++ b/out/production/Resurrection/net/brysonsteck/Resurrection/PlayerListener.class diff --git a/src/net/brysonsteck/Resurrection/PlayerListener.java b/src/net/brysonsteck/Resurrection/PlayerListener.java index f0c5d6e..b94e83d 100644 --- a/src/net/brysonsteck/Resurrection/PlayerListener.java +++ b/src/net/brysonsteck/Resurrection/PlayerListener.java @@ -17,30 +17,33 @@ public class PlayerListener implements Listener { public void onDeath(PlayerDeathEvent e) { System.out.println("Resurrection: A player has died!"); Player p = e.getEntity(); - p.setGameMode(GameMode.SPECTATOR); Long timeOfDeath = System.currentTimeMillis(); Long resurrectionTime = timeOfDeath + 86400000; TimeCheck death = new TimeCheck(timeOfDeath); - TimeCheck resurrect = new TimeCheck(timeOfDeath + 86400000); + TimeCheck resurrect = new TimeCheck((timeOfDeath + 86400000) - timeOfDeath); String deathFormatted = death.formatTime(); String resurrectFormatted = resurrect.formatTime(); - p.sendMessage("You have died!! You will be able to respawn in the next " + resurrectFormatted); + p.sendMessage("You have died!! You will be able to respawn in the next 24 hours."); } @EventHandler public void onPlayerRespawn(PlayerRespawnEvent e) { Player p = e.getPlayer(); - p.addPotionEffect(new PotionEffect(PotionEffectType.BLINDNESS, 86400, 255)); + p.setGameMode(GameMode.ADVENTURE); + p.addPotionEffect(new PotionEffect(PotionEffectType.INVISIBILITY, 1728000, 10, false)); + p.addPotionEffect(new PotionEffect(PotionEffectType.BLINDNESS, 1728000, 10, false)); + p.addPotionEffect(new PotionEffect(PotionEffectType.SLOW, 1728000, 10, false)); + p.setNoDamageTicks(1728000); } @EventHandler public void onPlayerMove(PlayerMoveEvent e) { Player p = e.getPlayer(); Location location = p.getLocation(); - if (p.getGameMode() == GameMode.SPECTATOR && p.hasPotionEffect(PotionEffectType.BLINDNESS)) { + if (p.getGameMode() == GameMode.ADVENTURE) { p.teleport(location); } } |