geforkt von Mirrors/Paper
Rebuild patch
By: md_5 <git@md-5.net>
Dieser Commit ist enthalten in:
Ursprung
00c0964347
Commit
49c30227d2
@ -17,7 +17,7 @@
|
|||||||
public class ItemBucket extends Item implements DispensibleContainerItem {
|
public class ItemBucket extends Item implements DispensibleContainerItem {
|
||||||
|
|
||||||
public final FluidType content;
|
public final FluidType content;
|
||||||
@@ -61,6 +71,16 @@
|
@@ -61,6 +71,17 @@
|
||||||
iblockdata = world.getType(blockposition);
|
iblockdata = world.getType(blockposition);
|
||||||
if (iblockdata.getBlock() instanceof IFluidSource) {
|
if (iblockdata.getBlock() instanceof IFluidSource) {
|
||||||
IFluidSource ifluidsource = (IFluidSource) iblockdata.getBlock();
|
IFluidSource ifluidsource = (IFluidSource) iblockdata.getBlock();
|
||||||
@ -35,7 +35,7 @@
|
|||||||
ItemStack itemstack1 = ifluidsource.removeFluid(world, blockposition, iblockdata);
|
ItemStack itemstack1 = ifluidsource.removeFluid(world, blockposition, iblockdata);
|
||||||
|
|
||||||
if (!itemstack1.isEmpty()) {
|
if (!itemstack1.isEmpty()) {
|
||||||
@@ -69,7 +89,7 @@
|
@@ -69,7 +90,7 @@
|
||||||
entityhuman.playSound(soundeffect, 1.0F, 1.0F);
|
entityhuman.playSound(soundeffect, 1.0F, 1.0F);
|
||||||
});
|
});
|
||||||
world.a((Entity) entityhuman, GameEvent.FLUID_PICKUP, blockposition);
|
world.a((Entity) entityhuman, GameEvent.FLUID_PICKUP, blockposition);
|
||||||
@ -44,7 +44,7 @@
|
|||||||
|
|
||||||
if (!world.isClientSide) {
|
if (!world.isClientSide) {
|
||||||
CriterionTriggers.FILLED_BUCKET.a((EntityPlayer) entityhuman, itemstack1);
|
CriterionTriggers.FILLED_BUCKET.a((EntityPlayer) entityhuman, itemstack1);
|
||||||
@@ -84,7 +104,7 @@
|
@@ -84,7 +105,7 @@
|
||||||
iblockdata = world.getType(blockposition);
|
iblockdata = world.getType(blockposition);
|
||||||
BlockPosition blockposition2 = iblockdata.getBlock() instanceof IFluidContainer && this.content == FluidTypes.WATER ? blockposition : blockposition1;
|
BlockPosition blockposition2 = iblockdata.getBlock() instanceof IFluidContainer && this.content == FluidTypes.WATER ? blockposition : blockposition1;
|
||||||
|
|
||||||
@ -53,7 +53,7 @@
|
|||||||
this.a(entityhuman, world, itemstack, blockposition2);
|
this.a(entityhuman, world, itemstack, blockposition2);
|
||||||
if (entityhuman instanceof EntityPlayer) {
|
if (entityhuman instanceof EntityPlayer) {
|
||||||
CriterionTriggers.PLACED_BLOCK.a((EntityPlayer) entityhuman, blockposition2, itemstack);
|
CriterionTriggers.PLACED_BLOCK.a((EntityPlayer) entityhuman, blockposition2, itemstack);
|
||||||
@@ -111,6 +131,11 @@
|
@@ -111,6 +132,11 @@
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean a(@Nullable EntityHuman entityhuman, World world, BlockPosition blockposition, @Nullable MovingObjectPositionBlock movingobjectpositionblock) {
|
public boolean a(@Nullable EntityHuman entityhuman, World world, BlockPosition blockposition, @Nullable MovingObjectPositionBlock movingobjectpositionblock) {
|
||||||
@ -65,7 +65,7 @@
|
|||||||
if (!(this.content instanceof FluidTypeFlowing)) {
|
if (!(this.content instanceof FluidTypeFlowing)) {
|
||||||
return false;
|
return false;
|
||||||
} else {
|
} else {
|
||||||
@@ -120,8 +145,18 @@
|
@@ -120,8 +146,18 @@
|
||||||
boolean flag = iblockdata.a(this.content);
|
boolean flag = iblockdata.a(this.content);
|
||||||
boolean flag1 = iblockdata.isAir() || flag || block instanceof IFluidContainer && ((IFluidContainer) block).canPlace(world, blockposition, iblockdata, this.content);
|
boolean flag1 = iblockdata.isAir() || flag || block instanceof IFluidContainer && ((IFluidContainer) block).canPlace(world, blockposition, iblockdata, this.content);
|
||||||
|
|
||||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren