diff options
author | Thinkofdeath <thinkofdeath@spigotmc.org> | 2014-12-07 12:20:52 +0100 |
---|---|---|
committer | Thinkofdeath <thinkofdeath@spigotmc.org> | 2014-12-07 12:20:52 +0100 |
commit | c7278edcfbfc81eea5617da54889c9cdd168f773 (patch) | |
tree | 3b12a6831ea728ffca2f58d1b1cbbfd82abc5b57 | |
parent | 7711956f441519a597d8ea7fb507cafa8608eccb (diff) | |
parent | 86eaec03f1a339fe282f16b83e6041796c722875 (diff) | |
download | craftbukkit-c7278edcfbfc81eea5617da54889c9cdd168f773.tar craftbukkit-c7278edcfbfc81eea5617da54889c9cdd168f773.tar.gz craftbukkit-c7278edcfbfc81eea5617da54889c9cdd168f773.tar.lz craftbukkit-c7278edcfbfc81eea5617da54889c9cdd168f773.tar.xz craftbukkit-c7278edcfbfc81eea5617da54889c9cdd168f773.zip |
Merge pull request #34 in SPIGOT/craftbukkit from ~GENAZT/craftbukkit:bugfix/SPIGOT-135 to master
* commit '86eaec03f1a339fe282f16b83e6041796c722875':
Add missing DispenseBehavior for Fireworks. Fixes SPIGOT-135
-rw-r--r-- | nms-patches/DispenseBehaviorFireworks.patch | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/nms-patches/DispenseBehaviorFireworks.patch b/nms-patches/DispenseBehaviorFireworks.patch new file mode 100644 index 00000000..b4896bbb --- /dev/null +++ b/nms-patches/DispenseBehaviorFireworks.patch @@ -0,0 +1,52 @@ +--- ../work/decompile-8eb82bde//net/minecraft/server/DispenseBehaviorFireworks.java Sat Dec 6 21:12:00 2014 ++++ src/main/java/net/minecraft/server/DispenseBehaviorFireworks.java Sat Dec 6 21:11:47 2014 +@@ -1,5 +1,8 @@ + package net.minecraft.server; + ++import org.bukkit.craftbukkit.inventory.CraftItemStack; ++import org.bukkit.event.block.BlockDispenseEvent; ++ + final class DispenseBehaviorFireworks extends DispenseBehaviorItem { + + DispenseBehaviorFireworks() {} +@@ -9,10 +12,38 @@ + double d0 = isourceblock.getX() + (double) enumdirection.getAdjacentX(); + double d1 = (double) ((float) isourceblock.getBlockPosition().getY() + 0.2F); + double d2 = isourceblock.getZ() + (double) enumdirection.getAdjacentZ(); +- EntityFireworks entityfireworks = new EntityFireworks(isourceblock.i(), d0, d1, d2, itemstack); + ++ // CraftBukkit start ++ World world = isourceblock.i(); ++ ItemStack itemstack1 = itemstack.a(1); ++ org.bukkit.block.Block block = world.getWorld().getBlockAt(isourceblock.getBlockPosition().getX(), isourceblock.getBlockPosition().getY(), isourceblock.getBlockPosition().getZ()); ++ CraftItemStack craftItem = CraftItemStack.asCraftMirror(itemstack1); ++ ++ BlockDispenseEvent event = new BlockDispenseEvent(block, craftItem.clone(), new org.bukkit.util.Vector(d0, d1, d2)); ++ if (!BlockDispenser.eventFired) { ++ world.getServer().getPluginManager().callEvent(event); ++ } ++ ++ if (event.isCancelled()) { ++ itemstack.count++; ++ return itemstack; ++ } ++ ++ if (!event.getItem().equals(craftItem)) { ++ itemstack.count++; ++ // Chain to handler for new item ++ ItemStack eventStack = CraftItemStack.asNMSCopy(event.getItem()); ++ IDispenseBehavior idispensebehavior = (IDispenseBehavior) BlockDispenser.M.get(eventStack.getItem()); ++ if (idispensebehavior != IDispenseBehavior.a && idispensebehavior != this) { ++ idispensebehavior.a(isourceblock, eventStack); ++ return itemstack; ++ } ++ } ++ ++ EntityFireworks entityfireworks = new EntityFireworks(isourceblock.i(), d0, d1, d2, itemstack); + isourceblock.i().addEntity(entityfireworks); +- itemstack.a(1); ++ // itemstack.a(1); // Handled during event processing ++ // CraftBukkit end + return itemstack; + } + |