2015-02-26 23:41:06 +01:00
|
|
|
--- /home/matt/mc-dev-private//net/minecraft/server/ItemHanging.java 2015-02-26 22:40:22.827608137 +0000
|
|
|
|
|
+++ src/main/java/net/minecraft/server/ItemHanging.java 2015-02-26 22:40:22.827608137 +0000
|
2014-11-25 22:32:16 +01:00
|
|
|
@@ -1,5 +1,11 @@
|
|
|
|
|
package net.minecraft.server;
|
|
|
|
|
|
|
|
|
|
+// CraftBukkit start
|
|
|
|
|
+import org.bukkit.entity.Player;
|
|
|
|
|
+import org.bukkit.event.hanging.HangingPlaceEvent;
|
|
|
|
|
+import org.bukkit.event.painting.PaintingPlaceEvent;
|
|
|
|
|
+// CraftBukkit end
|
|
|
|
|
+
|
|
|
|
|
public class ItemHanging extends Item {
|
|
|
|
|
|
2015-02-26 23:41:06 +01:00
|
|
|
private final Class<? extends EntityHanging> a;
|
2014-11-25 22:32:16 +01:00
|
|
|
@@ -24,6 +30,26 @@
|
|
|
|
|
|
|
|
|
|
if (entityhanging != null && entityhanging.survives()) {
|
2015-02-26 23:41:06 +01:00
|
|
|
if (!world.isClientSide) {
|
2014-11-25 22:32:16 +01:00
|
|
|
+ // CraftBukkit start - fire HangingPlaceEvent
|
|
|
|
|
+ Player who = (entityhuman == null) ? null : (Player) entityhuman.getBukkitEntity();
|
|
|
|
|
+ org.bukkit.block.Block blockClicked = world.getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ());
|
|
|
|
|
+ org.bukkit.block.BlockFace blockFace = org.bukkit.craftbukkit.block.CraftBlock.notchToBlockFace(enumdirection);
|
|
|
|
|
+
|
|
|
|
|
+ HangingPlaceEvent event = new HangingPlaceEvent((org.bukkit.entity.Hanging) entityhanging.getBukkitEntity(), who, blockClicked, blockFace);
|
|
|
|
|
+ world.getServer().getPluginManager().callEvent(event);
|
|
|
|
|
+
|
|
|
|
|
+ PaintingPlaceEvent paintingEvent = null;
|
|
|
|
|
+ if (entityhanging instanceof EntityPainting) {
|
|
|
|
|
+ // Fire old painting event until it can be removed
|
|
|
|
|
+ paintingEvent = new PaintingPlaceEvent((org.bukkit.entity.Painting) entityhanging.getBukkitEntity(), who, blockClicked, blockFace);
|
|
|
|
|
+ paintingEvent.setCancelled(event.isCancelled());
|
|
|
|
|
+ world.getServer().getPluginManager().callEvent(paintingEvent);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ if (event.isCancelled() || (paintingEvent != null && paintingEvent.isCancelled())) {
|
|
|
|
|
+ return false;
|
|
|
|
|
+ }
|
|
|
|
|
+ // CraftBukkit end
|
|
|
|
|
world.addEntity(entityhanging);
|
|
|
|
|
}
|
|
|
|
|
|
