From 1eed5ca36635fd088d5d88bd77f34ea31ee7c6d0 Mon Sep 17 00:00:00 2001 From: taoneill Date: Tue, 17 Jan 2012 23:36:49 -0500 Subject: [PATCH] Closes gh-355. Prevented use of items when still in spawn, including potions (which could be abused by switching between loadouts). --- .../main/java/bukkit/tommytony/war/WarPlayerListener.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/war/src/main/java/bukkit/tommytony/war/WarPlayerListener.java b/war/src/main/java/bukkit/tommytony/war/WarPlayerListener.java index 5320123..d699f2f 100644 --- a/war/src/main/java/bukkit/tommytony/war/WarPlayerListener.java +++ b/war/src/main/java/bukkit/tommytony/war/WarPlayerListener.java @@ -246,9 +246,10 @@ public class WarPlayerListener extends PlayerListener { Warzone zone = Warzone.getZoneByPlayerName(player.getName()); if (zone != null && zone.getLoadoutSelections().containsKey(player.getName()) - && zone.getLoadoutSelections().get(player.getName()).isStillInSpawn() && player.getItemInHand().getType() == Material.BOW) { + && zone.getLoadoutSelections().get(player.getName()).isStillInSpawn()) { event.setUseItemInHand(Result.DENY); - War.war.badMsg(player, "Can't shoot from inside the spawn."); + War.war.badMsg(player, "Can't use items while still in spawn."); + event.setCancelled(true); } } }