diff --git a/TwosideKeeper.jar b/TwosideKeeper.jar index 6d3248d..7867af1 100644 Binary files a/TwosideKeeper.jar and b/TwosideKeeper.jar differ diff --git a/src/sig/plugin/TwosideKeeper/SpleefManager.java b/src/sig/plugin/TwosideKeeper/SpleefManager.java index 2c9fd13..64902a2 100644 --- a/src/sig/plugin/TwosideKeeper/SpleefManager.java +++ b/src/sig/plugin/TwosideKeeper/SpleefManager.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.List; import org.bukkit.Location; +import org.bukkit.entity.Player; import org.bukkit.event.Event; import org.bukkit.plugin.Plugin; @@ -15,7 +16,7 @@ public class SpleefManager { * Contains an array for every type of spleef game available * along with a SpleefGame structure. */ - List spleef_game_list; + static List spleef_game_list; TwosideKeeper plugin; public SpleefManager(TwosideKeeper plug) { plugin = plug; @@ -55,4 +56,13 @@ public class SpleefManager { spleef_game_list.get(i).Tick(); } } + + public static boolean playerIsPlayingSpleef(Player p) { + for (int i=0;ip.getMaxHealth()) { p.setHealth(p.getMaxHealth()); } else { @@ -3367,7 +3369,7 @@ public class TwosideKeeper extends JavaPlugin implements Listener { GenericFunctions.breakHardenedItem(item); } else { - p.sendMessage(ChatColor.DARK_RED+"Your "+ChatColor.YELLOW+item.getType().toString().replaceAll("_", " ")+ChatColor.DARK_RED+" has broken!"); + p.sendMessage(ChatColor.DARK_RED+"Your "+ChatColor.YELLOW+GenericFunctions.UserFriendlyMaterialName(item)+ChatColor.DARK_RED+" has broken!"); } } @@ -4195,7 +4197,9 @@ public class TwosideKeeper extends JavaPlugin implements Listener { } p.setMaxHealth(hp); - p.setHealth(p.getHealth()); + if (!p.isDead()) { + p.setHealth(p.getHealth()); + } } diff --git a/src/sig/plugin/TwosideKeeper/TwosideKeeperAPI.java b/src/sig/plugin/TwosideKeeper/TwosideKeeperAPI.java index 77ce233..8f12aaf 100644 --- a/src/sig/plugin/TwosideKeeper/TwosideKeeperAPI.java +++ b/src/sig/plugin/TwosideKeeper/TwosideKeeperAPI.java @@ -67,6 +67,11 @@ public final class TwosideKeeperAPI { return GenericFunctions.breakHardenedItem(i); } + //Spleef COMMANDS. + public static boolean isPlayingSpleef(Player p) { + return SpleefManager.playerIsPlayingSpleef(p); + } + //Friendly Name COMMANDS. public static String getLocalizedItemName(ItemStack i) { return GenericFunctions.UserFriendlyMaterialName(i);