diff options
author | md_5 <git@md-5.net> | 2017-05-19 21:00:13 +1000 |
---|---|---|
committer | md_5 <git@md-5.net> | 2017-05-19 21:00:13 +1000 |
commit | 10043529907a4ba913ebe2712876e4b1911263b8 (patch) | |
tree | 37f3cbb2527d02eac320ed0900bf92a4f3c8407c /nms-patches/DispenserRegistry.patch | |
parent | 3ecbb59cbb9e20064d04628d26387742705ab9ac (diff) | |
download | craftbukkit-10043529907a4ba913ebe2712876e4b1911263b8.tar craftbukkit-10043529907a4ba913ebe2712876e4b1911263b8.tar.gz craftbukkit-10043529907a4ba913ebe2712876e4b1911263b8.tar.lz craftbukkit-10043529907a4ba913ebe2712876e4b1911263b8.tar.xz craftbukkit-10043529907a4ba913ebe2712876e4b1911263b8.zip |
Update to Minecraft 1.12-pre5
Diffstat (limited to 'nms-patches/DispenserRegistry.patch')
-rw-r--r-- | nms-patches/DispenserRegistry.patch | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/nms-patches/DispenserRegistry.patch b/nms-patches/DispenserRegistry.patch index 310e6d55..bf0e83c3 100644 --- a/nms-patches/DispenserRegistry.patch +++ b/nms-patches/DispenserRegistry.patch @@ -16,7 +16,7 @@ public class DispenserRegistry { public static final PrintStream a = System.out; -@@ -70,7 +79,7 @@ +@@ -71,7 +80,7 @@ BlockDispenser.REGISTRY.a(Items.SPLASH_POTION, new IDispenseBehavior() { public ItemStack a(ISourceBlock isourceblock, final ItemStack itemstack) { return (new DispenseBehaviorProjectile() { @@ -25,7 +25,7 @@ return new EntityPotion(world, iposition.getX(), iposition.getY(), iposition.getZ(), itemstack1.cloneItemStack()); } -@@ -87,7 +96,7 @@ +@@ -88,7 +97,7 @@ BlockDispenser.REGISTRY.a(Items.LINGERING_POTION, new IDispenseBehavior() { public ItemStack a(ISourceBlock isourceblock, final ItemStack itemstack) { return (new DispenseBehaviorProjectile() { @@ -34,7 +34,7 @@ return new EntityPotion(world, iposition.getX(), iposition.getY(), iposition.getZ(), itemstack1.cloneItemStack()); } -@@ -107,14 +116,46 @@ +@@ -108,14 +117,46 @@ double d0 = isourceblock.getX() + (double) enumdirection.getAdjacentX(); double d1 = (double) ((float) (isourceblock.getBlockPosition().getY() + enumdirection.getAdjacentY()) + 0.2F); double d2 = isourceblock.getZ() + (double) enumdirection.getAdjacentZ(); @@ -83,7 +83,7 @@ return itemstack; } }); -@@ -124,10 +165,39 @@ +@@ -125,10 +166,39 @@ double d0 = isourceblock.getX() + (double) enumdirection.getAdjacentX(); double d1 = (double) ((float) isourceblock.getBlockPosition().getY() + 0.2F); double d2 = isourceblock.getZ() + (double) enumdirection.getAdjacentZ(); @@ -125,7 +125,7 @@ return itemstack; } -@@ -148,8 +218,38 @@ +@@ -149,8 +219,38 @@ double d4 = random.nextGaussian() * 0.05D + (double) enumdirection.getAdjacentY(); double d5 = random.nextGaussian() * 0.05D + (double) enumdirection.getAdjacentZ(); @@ -166,7 +166,7 @@ return itemstack; } -@@ -170,7 +270,53 @@ +@@ -171,7 +271,53 @@ ItemBucket itembucket = (ItemBucket) itemstack.getItem(); BlockPosition blockposition = isourceblock.getBlockPosition().shift((EnumDirection) isourceblock.e().get(BlockDispenser.FACING)); @@ -221,7 +221,7 @@ } }; -@@ -197,6 +343,30 @@ +@@ -198,6 +344,30 @@ item = Items.LAVA_BUCKET; } @@ -252,7 +252,7 @@ world.setAir(blockposition); itemstack.subtract(1); if (itemstack.isEmpty()) { -@@ -214,14 +384,42 @@ +@@ -215,14 +385,42 @@ protected ItemStack b(ISourceBlock isourceblock, ItemStack itemstack) { World world = isourceblock.getWorld(); @@ -298,7 +298,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); -@@ -239,6 +437,32 @@ +@@ -240,6 +438,32 @@ World world = isourceblock.getWorld(); BlockPosition blockposition = isourceblock.getBlockPosition().shift((EnumDirection) isourceblock.e().get(BlockDispenser.FACING)); @@ -331,7 +331,7 @@ if (ItemDye.a(itemstack, world, blockposition)) { if (!world.isClientSide) { world.triggerEffect(2005, blockposition, 0); -@@ -246,6 +470,26 @@ +@@ -247,6 +471,26 @@ } else { this.b = false; } @@ -358,7 +358,7 @@ return itemstack; } else { -@@ -257,11 +501,40 @@ +@@ -258,11 +502,40 @@ protected ItemStack b(ISourceBlock isourceblock, ItemStack itemstack) { World world = isourceblock.getWorld(); BlockPosition blockposition = isourceblock.getBlockPosition().shift((EnumDirection) isourceblock.e().get(BlockDispenser.FACING)); @@ -401,7 +401,7 @@ return itemstack; } }); -@@ -272,6 +545,30 @@ +@@ -273,6 +546,30 @@ BlockPosition blockposition = isourceblock.getBlockPosition().shift(enumdirection); BlockSkull blockskull = Blocks.SKULL; @@ -432,7 +432,7 @@ this.b = true; if (world.isEmpty(blockposition) && blockskull.b(world, blockposition, itemstack)) { if (!world.isClientSide) { -@@ -320,6 +617,30 @@ +@@ -321,6 +618,30 @@ BlockPosition blockposition = isourceblock.getBlockPosition().shift((EnumDirection) isourceblock.e().get(BlockDispenser.FACING)); BlockPumpkin blockpumpkin = (BlockPumpkin) Blocks.PUMPKIN; @@ -463,7 +463,7 @@ this.b = true; if (world.isEmpty(blockposition) && blockpumpkin.b(world, blockposition)) { if (!world.isClientSide) { -@@ -403,6 +724,30 @@ +@@ -407,6 +728,30 @@ EnumDirection enumdirection = (EnumDirection) isourceblock.e().get(BlockDispenser.FACING); BlockPosition blockposition = isourceblock.getBlockPosition().shift(enumdirection); @@ -494,7 +494,7 @@ this.b = world.a(block, blockposition, false, EnumDirection.DOWN, (Entity) null); if (this.b) { EnumDirection enumdirection1 = world.isEmpty(blockposition.down()) ? enumdirection : EnumDirection.UP; -@@ -471,12 +816,40 @@ +@@ -475,12 +820,40 @@ d3 = 0.0D; } |