Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-23 09:27:45 +01:00
Code Issues Projects Releases Wiki Activity

SPIGOT-4188: Fish not dispensing from buckets

Browse Source
This commit is contained in:
md_5 2018-07-30 09:43:46 +10:00
parent b94fd7c7e4
commit 0b274effbb
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
nms-patches/DispenserRegistry.patch
View File

@ -158,7 +158,7 @@
return itemstack;
}
@@ -175,9 +271,51 @@
@@ -175,9 +271,52 @@
BlockPosition blockposition = isourceblock.getBlockPosition().shift((EnumDirection) isourceblock.e().get(BlockDispenser.FACING));
World world = isourceblock.getWorld();
@ -196,7 +196,7 @@
+ // CraftBukkit end
+
if (itembucket.a((EntityHuman) null, world, blockposition, (MovingObjectPosition) null)) {
- itembucket.a(world, itemstack, blockposition);
itembucket.a(world, itemstack, blockposition);
- return new ItemStack(Items.BUCKET);
+ // CraftBukkit start - Handle stacked buckets
+ Item item = Items.BUCKET;
@ -212,7 +212,7 @@
} else {
return this.a.dispense(isourceblock, itemstack);
}
@@ -207,6 +345,30 @@
@@ -207,6 +346,30 @@
} else {
Item item = fluidtype.b();
@ -243,7 +243,7 @@
itemstack.subtract(1);
if (itemstack.isEmpty()) {
return new ItemStack(item);
@@ -227,11 +389,39 @@
@@ -227,11 +390,39 @@
protected ItemStack a(ISourceBlock isourceblock, ItemStack itemstack) {
World world = isourceblock.getWorld();
@ -284,7 +284,7 @@
} else {
Block block = world.getType(blockposition).getBlock();
@@ -255,12 +445,55 @@
@@ -255,12 +446,55 @@
this.a = true;
World world = isourceblock.getWorld();
BlockPosition blockposition = isourceblock.getBlockPosition().shift((EnumDirection) isourceblock.e().get(BlockDispenser.FACING));
@ -340,7 +340,7 @@
return itemstack;
}
@@ -269,11 +502,40 @@
@@ -269,11 +503,40 @@
protected ItemStack a(ISourceBlock isourceblock, ItemStack itemstack) {
World world = isourceblock.getWorld();
BlockPosition blockposition = isourceblock.getBlockPosition().shift((EnumDirection) isourceblock.e().get(BlockDispenser.FACING));
@ -383,7 +383,7 @@
return itemstack;
}
}));
@@ -295,6 +557,30 @@
@@ -295,6 +558,30 @@
EnumDirection enumdirection = (EnumDirection) isourceblock.e().get(BlockDispenser.FACING);
BlockPosition blockposition = isourceblock.getBlockPosition().shift(enumdirection);
@ -414,7 +414,7 @@
this.a = true;
if (world.isEmpty(blockposition) && BlockWitherSkull.b(world, blockposition, itemstack)) {
world.setTypeAndData(blockposition, (IBlockData) Blocks.WITHER_SKELETON_SKULL.getBlockData().set(BlockSkull.a, Integer.valueOf(enumdirection.opposite().get2DRotationValue() * 4)), 3);
@@ -318,6 +604,30 @@
@@ -318,6 +605,30 @@
BlockPosition blockposition = isourceblock.getBlockPosition().shift((EnumDirection) isourceblock.e().get(BlockDispenser.FACING));
BlockPumpkinCarved blockpumpkincarved = (BlockPumpkinCarved) Blocks.CARVED_PUMPKIN;
@ -445,7 +445,7 @@
this.a = true;
if (world.isEmpty(blockposition) && blockpumpkincarved.a((IWorldReader) world, blockposition)) {
if (!world.isClientSide) {
@@ -379,6 +689,51 @@
@@ -379,6 +690,51 @@
}
d();
@ -497,7 +497,7 @@
}
}
}
@@ -387,7 +742,7 @@
@@ -387,7 +743,7 @@
LocaleLanguage localelanguage = LocaleLanguage.a();
registrymaterials.iterator().forEachRemaining((object) -> {
@ -506,7 +506,7 @@
if (!localelanguage.b(s)) {
DispenserRegistry.c.warn("Missing translation for {}: {} (key: \'{}\')", s1, registrymaterials.b(object), s);
@@ -481,6 +836,30 @@
@@ -481,6 +837,30 @@
BlockPosition blockposition = isourceblock.getBlockPosition().shift(enumdirection);
EnumDirection enumdirection1 = isourceblock.getWorld().isEmpty(blockposition.down()) ? enumdirection : EnumDirection.UP;
@ -537,7 +537,7 @@
this.a = ((ItemBlock) item).a((BlockActionContext) (new DispenserRegistry.b(isourceblock.getWorld(), blockposition, enumdirection, itemstack, enumdirection1))) == EnumInteractionResult.SUCCESS;
if (this.a) {
itemstack.subtract(1);
@@ -534,12 +913,40 @@
@@ -534,12 +914,40 @@
d3 = 0.0D;
}