From bf1f5b00d7c8cb078adc7528f2a3d85561ca09f6 Mon Sep 17 00:00:00 2001 From: EvilSeph Date: Mon, 2 May 2011 04:30:51 -0400 Subject: [PATCH] Added PlayerInteractEntityEvent which fires when a player right clicks an entity. Thanks fullwall! --- src/main/java/net/minecraft/server/NetServerHandler.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/java/net/minecraft/server/NetServerHandler.java b/src/main/java/net/minecraft/server/NetServerHandler.java index 8a9ab5f608..6cee628bc4 100644 --- a/src/main/java/net/minecraft/server/NetServerHandler.java +++ b/src/main/java/net/minecraft/server/NetServerHandler.java @@ -798,6 +798,13 @@ public class NetServerHandler extends NetHandler implements ICommandListener { if (entity != null && this.player.e(entity) && this.player.f(entity) < 4.0F) { if (packet7useentity.c == 0) { + // CraftBukkit start + PlayerInteractEntityEvent piee = new PlayerInteractEntityEvent((Player) getPlayer(), entity.getBukkitEntity()); + server.getPluginManager().callEvent(piee); + if (piee.isCancelled()) { + return; + } + // CraftBukkit end this.player.c(entity); } else if (packet7useentity.c == 1) { this.player.d(entity);