summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2016-11-18 09:14:51 +1100
committermd_5 <git@md-5.net>2016-11-18 09:14:51 +1100
commitb2f82f0f7f2e3d62a9f5511d0e19974ea9410dfd (patch)
treee2398df593d6797f6b4635b1560e56402d9cdbc5
parent64032adfd28dbe545ce9dab346a1b9abbc56d349 (diff)
downloadcraftbukkit-b2f82f0f7f2e3d62a9f5511d0e19974ea9410dfd.tar
craftbukkit-b2f82f0f7f2e3d62a9f5511d0e19974ea9410dfd.tar.gz
craftbukkit-b2f82f0f7f2e3d62a9f5511d0e19974ea9410dfd.tar.lz
craftbukkit-b2f82f0f7f2e3d62a9f5511d0e19974ea9410dfd.tar.xz
craftbukkit-b2f82f0f7f2e3d62a9f5511d0e19974ea9410dfd.zip
Remove now redundant code
-rw-r--r--src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index 1c67ee9f..b84b376a 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -220,10 +220,6 @@ public class CraftEventFactory {
}
BlockFace blockFace = CraftBlock.notchToBlockFace(direction);
- if (itemInHand.getType() == Material.AIR || itemInHand.getAmount() == 0) {
- itemInHand = null;
- }
-
PlayerInteractEvent event = new PlayerInteractEvent(player, action, itemInHand, blockClicked, blockFace, (hand == null) ? null : ((hand == EnumHand.OFF_HAND) ? EquipmentSlot.OFF_HAND : EquipmentSlot.HAND));
if (cancelledBlock) {
event.setUseInteractedBlock(Event.Result.DENY);