diff options
Diffstat (limited to 'src/net')
| -rw-r--r-- | src/net/brysonsteck/Resurrection/commands/CommandResurrect.java | 20 | ||||
| -rw-r--r-- | src/net/brysonsteck/Resurrection/player/PlayerListener.java | 20 |
2 files changed, 16 insertions, 24 deletions
diff --git a/src/net/brysonsteck/Resurrection/commands/CommandResurrect.java b/src/net/brysonsteck/Resurrection/commands/CommandResurrect.java index 371e3c1..e26575c 100644 --- a/src/net/brysonsteck/Resurrection/commands/CommandResurrect.java +++ b/src/net/brysonsteck/Resurrection/commands/CommandResurrect.java @@ -61,12 +61,10 @@ public class CommandResurrect implements CommandExecutor { resurrectPlayer.removePotionEffect(effect.getType()); resurrectPlayer.setGameMode(GameMode.SURVIVAL); for(Player player : Bukkit.getOnlinePlayers()){ - try { - player.playSound(player.getLocation(), Sound.ENTITY_ENDERDRAGON_GROWL, 1, 0); - } catch (NoSuchFieldError e) { - log.warning("NoSuchFieldError encountered, playing Wither noise instead."); - player.playSound(player.getLocation(), Sound.WITHER_DEATH, 1, 0); - } + // for versions > 1.8 + player.playSound(player.getLocation(), Sound.ENTITY_WITHER_DEATH, 1, 0); + // for version 1.8 + //player.playSound(player.getLocation(), Sound.WITHER_DEATH, 1, 0); } Bukkit.broadcastMessage(ChatColor.YELLOW +""+ ChatColor.BOLD + strings[0] + " has been resurrected manually by an admin!"); removeDeath(resurrectPlayer); @@ -113,12 +111,10 @@ public class CommandResurrect implements CommandExecutor { resurrectPlayer.removePotionEffect(effect.getType()); resurrectPlayer.setGameMode(GameMode.SURVIVAL); for(Player player : Bukkit.getOnlinePlayers()){ - try { - player.playSound(player.getLocation(), Sound.ENTITY_ENDERDRAGON_GROWL, 1, 0); - } catch (NoSuchFieldError e) { - log.warning("NoSuchFieldError encountered, playing Wither noise instead."); - player.playSound(player.getLocation(), Sound.WITHER_DEATH, 1, 0); - } + // for versions > 1.8 + player.playSound(player.getLocation(), Sound.ENTITY_WITHER_DEATH, 1, 0); + // for version 1.8 + //player.playSound(player.getLocation(), Sound.WITHER_DEATH, 1, 0); } Bukkit.broadcastMessage(strings[0] + " has been resurrected manually by an admin!"); removeDeath(resurrectPlayer); diff --git a/src/net/brysonsteck/Resurrection/player/PlayerListener.java b/src/net/brysonsteck/Resurrection/player/PlayerListener.java index 6c95418..424e0fc 100644 --- a/src/net/brysonsteck/Resurrection/player/PlayerListener.java +++ b/src/net/brysonsteck/Resurrection/player/PlayerListener.java @@ -148,12 +148,10 @@ public class PlayerListener implements Listener { p.teleport(spawn); } for(Player p : Bukkit.getOnlinePlayers()){ - try { - p.playSound(p.getLocation(), Sound.ENTITY_ENDERDRAGON_GROWL, 1, 0); - } catch (NoSuchFieldError e) { - log.warning("NoSuchFieldError encountered, playing Wither noise instead."); - p.playSound(p.getLocation(), Sound.WITHER_DEATH, 1, 0); - } + // for versions > 1.8 + p.playSound(p.getLocation(), Sound.ENTITY_WITHER_DEATH, 1, 0); + // for version 1.8 + //p.playSound(p.getLocation(), Sound.WITHER_DEATH, 1, 0); } } }.runTaskLater(JavaPlugin.getProvidingPlugin(Resurrection.class), timeToResurrection); @@ -244,12 +242,10 @@ public class PlayerListener implements Listener { p.teleport(spawn); } for(Player p : Bukkit.getOnlinePlayers()){ - try { - p.playSound(p.getLocation(), Sound.ENTITY_ENDERDRAGON_GROWL, 1, 0); - } catch (NoSuchFieldError e) { - log.warning("NoSuchFieldError encountered, playing Wither noise instead."); - p.playSound(p.getLocation(), Sound.WITHER_DEATH, 1, 0); - } + // for versions > 1.8 + p.playSound(p.getLocation(), Sound.ENTITY_WITHER_DEATH, 1, 0); + // for version 1.8 + //p.playSound(p.getLocation(), Sound.WITHER_DEATH, 1, 0); } } }.runTaskLater(JavaPlugin.getProvidingPlugin(Resurrection.class), timeToResurrection); |