Merge pull request #81 from tylermurphy534/1.6.2

1.6.2

2 files changed, 15 insertions, 2 deletions

diff --git a/src/main/java/net/tylermurphy/hideAndSeek/game/listener/PlayerHandler.java b/src/main/java/net/tylermurphy/hideAndSeek/game/listener/PlayerHandler.java
index d8790fd..1e7ba69 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/game/listener/PlayerHandler.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/game/listener/PlayerHandler.java
@@ -1,13 +1,18 @@
 package net.tylermurphy.hideAndSeek.game.listener;
 
 import net.tylermurphy.hideAndSeek.Main;
+import net.tylermurphy.hideAndSeek.configuration.Items;
+import net.tylermurphy.hideAndSeek.game.Game;
+import net.tylermurphy.hideAndSeek.game.util.Status;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.EntityRegainHealthEvent;
 import org.bukkit.event.entity.FoodLevelChangeEvent;
+import org.bukkit.event.entity.ItemSpawnEvent;
 import org.bukkit.event.player.PlayerDropItemEvent;
+import org.bukkit.inventory.ItemStack;
 
 public class PlayerHandler implements Listener {
 
@@ -36,4 +41,12 @@ public class PlayerHandler implements Listener {
         }
     }
 
+    @EventHandler(priority = EventPriority.HIGHEST)
+    public void onItemSpawn(ItemSpawnEvent event){
+        if(Main.getInstance().getGame().getStatus() == Status.STANDBY) return;
+        ItemStack item = event.getEntity().getItemStack();
+        if(!Items.matchItem(item)) return;
+        event.setCancelled(true);
+    }
+
 }
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/game/util/Disguise.java b/src/main/java/net/tylermurphy/hideAndSeek/game/util/Disguise.java
index e29350b..b9ea09b 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/game/util/Disguise.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/game/util/Disguise.java
@@ -26,9 +26,9 @@ public class Disguise {
     static {
         if(Main.getInstance().supports(9)) {
             Scoreboard board = Bukkit.getScoreboardManager().getMainScoreboard();
-            hidden = board.getTeam("KenshinHideAndSeek_CollisionGroup");
+            hidden = board.getTeam("KHS_Collision");
             if (hidden == null) {
-                hidden = board.registerNewTeam("KenshinHideAndSeek_CollisionGroup");
+                hidden = board.registerNewTeam("KHS_Collision");
             }
             hidden.setOption(Team.Option.COLLISION_RULE, Team.OptionStatus.NEVER);
             hidden.setCanSeeFriendlyInvisibles(false);