diff options
Diffstat (limited to 'nms-patches/DispenserRegistry.patch')
| -rw-r--r-- | nms-patches/DispenserRegistry.patch | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/nms-patches/DispenserRegistry.patch b/nms-patches/DispenserRegistry.patch index 66bb7d32..522519c9 100644 --- a/nms-patches/DispenserRegistry.patch +++ b/nms-patches/DispenserRegistry.patch @@ -121,7 +121,7 @@ return itemstack; } -@@ -147,13 +213,44 @@ +@@ -147,8 +213,38 @@ double d4 = random.nextGaussian() * 0.05D + (double) enumdirection.getAdjacentY(); double d5 = random.nextGaussian() * 0.05D + (double) enumdirection.getAdjacentZ(); @@ -162,13 +162,7 @@ return itemstack; } - protected void a(ISourceBlock isourceblock) { - isourceblock.getWorld().triggerEffect(1018, isourceblock.getBlockPosition(), 0); -+ - } - }); - BlockDispenser.REGISTRY.a(Items.aG, new DispenserRegistry.a(EntityBoat.EnumBoatType.OAK)); -@@ -169,9 +266,48 @@ +@@ -169,9 +265,48 @@ ItemBucket itembucket = (ItemBucket) itemstack.getItem(); BlockPosition blockposition = isourceblock.getBlockPosition().shift(BlockDispenser.e(isourceblock.f())); @@ -219,7 +213,7 @@ return itemstack; } else { return this.b.a(isourceblock, itemstack); -@@ -202,6 +338,30 @@ +@@ -202,6 +337,30 @@ item = Items.LAVA_BUCKET; } @@ -250,7 +244,7 @@ world.setAir(blockposition); if (--itemstack.count == 0) { itemstack.setItem(item); -@@ -220,11 +380,39 @@ +@@ -220,11 +379,39 @@ World world = isourceblock.getWorld(); BlockPosition blockposition = isourceblock.getBlockPosition().shift(BlockDispenser.e(isourceblock.f())); @@ -293,7 +287,7 @@ } else if (world.getType(blockposition).getBlock() == Blocks.TNT) { Blocks.TNT.postBreak(world, blockposition, Blocks.TNT.getBlockData().set(BlockTNT.EXPLODE, Boolean.valueOf(true))); world.setAir(blockposition); -@@ -252,6 +440,30 @@ +@@ -252,6 +439,30 @@ World world = isourceblock.getWorld(); BlockPosition blockposition = isourceblock.getBlockPosition().shift(BlockDispenser.e(isourceblock.f())); @@ -324,7 +318,7 @@ if (ItemDye.a(itemstack, world, blockposition)) { if (!world.isClientSide) { world.triggerEffect(2005, blockposition, 0); -@@ -279,11 +491,40 @@ +@@ -279,11 +490,40 @@ protected ItemStack b(ISourceBlock isourceblock, ItemStack itemstack) { World world = isourceblock.getWorld(); BlockPosition blockposition = isourceblock.getBlockPosition().shift(BlockDispenser.e(isourceblock.f())); @@ -361,13 +355,13 @@ + // CraftBukkit end world.addEntity(entitytntprimed); - world.a((EntityHuman) null, entitytntprimed.locX, entitytntprimed.locY, entitytntprimed.locZ, SoundEffects.gj, SoundCategory.BLOCKS, 1.0F, 1.0F); + world.a((EntityHuman) null, entitytntprimed.locX, entitytntprimed.locY, entitytntprimed.locZ, SoundEffects.gk, SoundCategory.BLOCKS, 1.0F, 1.0F); - --itemstack.count; + // --itemstack.count; // CraftBukkit - handled above return itemstack; } }); -@@ -437,12 +678,40 @@ +@@ -437,12 +677,40 @@ d3 = 0.0D; } |