DemonWav / CraftBukkit / c1b529eddc7

Commits

md_5 authored c1b529eddc7 19 Sep 2016

SPIGOT-2683: Missing BlockDispenseEvents

nms-patches/DispenserRegistry.patch

Modified

-354
++                EntityTNTPrimed entitytntprimed = new EntityTNTPrimed(world, event.getVelocity().getX(), event.getVelocity().getY(), event.getVelocity().getZ(), (EntityLiving) null);
-355
++                // CraftBukkit end
-356
-357
+                 world.addEntity(entitytntprimed);
-358
+                 world.a((EntityHuman) null, entitytntprimed.locX, entitytntprimed.locY, entitytntprimed.locZ, SoundEffects.gz, SoundCategory.BLOCKS, 1.0F, 1.0F);
-359
+-                --itemstack.count;
-360
++                // --itemstack.count; // CraftBukkit - handled above
-361
+                 return itemstack;
-362
+             }
-363
+         });
--
+@@ -437,12 +677,40 @@
-+
+@@ -296,6 +536,30 @@
-+
+                 BlockPosition blockposition = isourceblock.getBlockPosition().shift(enumdirection);
-+
+                 BlockSkull blockskull = Blocks.SKULL;
-+
-+
++                // CraftBukkit start
-+
++                org.bukkit.block.Block bukkitBlock = world.getWorld().getBlockAt(isourceblock.getBlockPosition().getX(), isourceblock.getBlockPosition().getY(), isourceblock.getBlockPosition().getZ());
-+
++                CraftItemStack craftItem = CraftItemStack.asCraftMirror(itemstack);
 +
-+
++                BlockDispenseEvent event = new BlockDispenseEvent(bukkitBlock, craftItem.clone(), new org.bukkit.util.Vector(blockposition.getX(), blockposition.getY(), blockposition.getZ()));
-+
++                if (!BlockDispenser.eventFired) {
-+
++                    world.getServer().getPluginManager().callEvent(event);
-+
++                }
 +
-+
++                if (event.isCancelled()) {
-+
++                    return itemstack;
-+
++                }
 +
-+
++                if (!event.getItem().equals(craftItem)) {
-+
++                    // Chain to handler for new item
-+
++                    ItemStack eventStack = CraftItemStack.asNMSCopy(event.getItem());
-+
++                    IDispenseBehavior idispensebehavior = (IDispenseBehavior) BlockDispenser.REGISTRY.get(eventStack.getItem());
-+
++                    if (idispensebehavior != IDispenseBehavior.NONE && idispensebehavior != this) {
-+
++                        idispensebehavior.a(isourceblock, eventStack);
-+
++                        return itemstack;
-+
++                    }
-+
++                }
-+
++                // CraftBukkit end
 +
-+
+                 if (world.isEmpty(blockposition) && blockskull.b(world, blockposition, itemstack)) {
-+
+                     if (!world.isClientSide) {
-+
+                         world.setTypeAndData(blockposition, blockskull.getBlockData().set(BlockSkull.FACING, EnumDirection.UP), 3);
-+
+@@ -354,6 +618,30 @@
-+
+                 BlockPosition blockposition = isourceblock.getBlockPosition().shift((EnumDirection) isourceblock.e().get(BlockDispenser.FACING));
-+
+                 BlockPumpkin blockpumpkin = (BlockPumpkin) Blocks.PUMPKIN;
-+
-+
++                // CraftBukkit start
-+
++                org.bukkit.block.Block bukkitBlock = world.getWorld().getBlockAt(isourceblock.getBlockPosition().getX(), isourceblock.getBlockPosition().getY(), isourceblock.getBlockPosition().getZ());
-+
++                CraftItemStack craftItem = CraftItemStack.asCraftMirror(itemstack);
 +
-+
++                BlockDispenseEvent event = new BlockDispenseEvent(bukkitBlock, craftItem.clone(), new org.bukkit.util.Vector(blockposition.getX(), blockposition.getY(), blockposition.getZ()));
-+
++                if (!BlockDispenser.eventFired) {
-+
++                    world.getServer().getPluginManager().callEvent(event);
-+
++                }
 +
-+
++                if (event.isCancelled()) {
-+
++                    return itemstack;
-+
++                }
 +
-+
++                if (!event.getItem().equals(craftItem)) {
-+
++                    // Chain to handler for new item
-+
++                    ItemStack eventStack = CraftItemStack.asNMSCopy(event.getItem());
-+
++                    IDispenseBehavior idispensebehavior = (IDispenseBehavior) BlockDispenser.REGISTRY.get(eventStack.getItem());
-+
++                    if (idispensebehavior != IDispenseBehavior.NONE && idispensebehavior != this) {
-+
++                        idispensebehavior.a(isourceblock, eventStack);
-+
++                        return itemstack;
-+
++                    }
-+
++                }
-+
++                // CraftBukkit end
 +
-+
+                 if (world.isEmpty(blockposition) && blockpumpkin.b(world, blockposition)) {
-+
+                     if (!world.isClientSide) {
-+
+                         world.setTypeAndData(blockposition, blockpumpkin.getBlockData(), 3);
-+
+@@ -437,12 +725,40 @@
-427
+                 d3 = 0.0D;
-428
+             }
-429
-430
+-            EntityBoat entityboat = new EntityBoat(world, d0, d1 + d3, d2);
-431
++            // EntityBoat entityboat = new EntityBoat(world, d0, d1 + d3, d2);
-432
++            // CraftBukkit start
-433
++            ItemStack itemstack1 = itemstack.cloneAndSubtract(1);
-434
++            org.bukkit.block.Block block = world.getWorld().getBlockAt(isourceblock.getBlockPosition().getX(), isourceblock.getBlockPosition().getY(), isourceblock.getBlockPosition().getZ());
-435
++            CraftItemStack craftItem = CraftItemStack.asCraftMirror(itemstack1);
-436
++

CraftBukkit

Commits

Jira Issues

Add shortcut