2015-02-26 23:41:06 +01:00
|
|
|
--- /home/matt/mc-dev-private//net/minecraft/server/ItemLeash.java 2015-02-26 22:40:22.827608137 +0000
|
|
|
|
|
+++ src/main/java/net/minecraft/server/ItemLeash.java 2015-02-26 22:40:22.831608137 +0000
|
2014-11-25 22:32:16 +01:00
|
|
|
@@ -3,6 +3,8 @@
|
|
|
|
|
import java.util.Iterator;
|
|
|
|
|
import java.util.List;
|
|
|
|
|
|
|
|
|
|
+import org.bukkit.event.hanging.HangingPlaceEvent; // CraftBukkit
|
|
|
|
|
+
|
|
|
|
|
public class ItemLeash extends Item {
|
|
|
|
|
|
|
|
|
|
public ItemLeash() {
|
|
|
|
|
@@ -40,7 +42,23 @@
|
2015-02-26 23:41:06 +01:00
|
|
|
if (entityinsentient.cc() && entityinsentient.getLeashHolder() == entityhuman) {
|
2014-11-25 22:32:16 +01:00
|
|
|
if (entityleash == null) {
|
|
|
|
|
entityleash = EntityLeash.a(world, blockposition);
|
|
|
|
|
+
|
|
|
|
|
+ // CraftBukkit start - fire HangingPlaceEvent
|
|
|
|
|
+ HangingPlaceEvent event = new HangingPlaceEvent((org.bukkit.entity.Hanging) entityleash.getBukkitEntity(), entityhuman != null ? (org.bukkit.entity.Player) entityhuman.getBukkitEntity() : null, world.getWorld().getBlockAt(i, j, k), org.bukkit.block.BlockFace.SELF);
|
|
|
|
|
+ world.getServer().getPluginManager().callEvent(event);
|
|
|
|
|
+
|
|
|
|
|
+ if (event.isCancelled()) {
|
|
|
|
|
+ entityleash.die();
|
|
|
|
|
+ return false;
|
|
|
|
|
+ }
|
|
|
|
|
+ // CraftBukkit end
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ // CraftBukkit start
|
|
|
|
|
+ if (org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerLeashEntityEvent(entityinsentient, entityleash, entityhuman).isCancelled()) {
|
|
|
|
|
+ continue;
|
|
|
|
|
}
|
|
|
|
|
+ // CraftBukkit end
|
|
|
|
|
|
|
|
|
|
entityinsentient.setLeashHolder(entityleash, true);
|
|
|
|
|
flag = true;
|
