mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-18 03:25:18 +00:00
57 lines
2.0 KiB
Diff
57 lines
2.0 KiB
Diff
--- ../src-base/minecraft/net/minecraft/block/BlockPistonBase.java
|
|
+++ ../src-work/minecraft/net/minecraft/block/BlockPistonBase.java
|
|
@@ -439,7 +439,7 @@
|
|
return false;
|
|
}
|
|
|
|
- return !(Block.blocksList[par0] instanceof ITileEntityProvider);
|
|
+ return !par1World.blockHasTileEntity(par2, par3, par4);
|
|
}
|
|
}
|
|
|
|
@@ -457,14 +457,14 @@
|
|
{
|
|
if (l1 < 13)
|
|
{
|
|
- if (j1 <= 0 || j1 >= 255)
|
|
+ if (j1 <= 0 || j1 >= par0World.getHeight() - 1)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
int i2 = par0World.getBlockId(i1, j1, k1);
|
|
|
|
- if (i2 != 0)
|
|
+ if (!par0World.isAirBlock(i1, j1, k1))
|
|
{
|
|
if (!canPushBlock(i2, par0World, i1, j1, k1, true))
|
|
{
|
|
@@ -507,14 +507,14 @@
|
|
|
|
if (l1 < 13)
|
|
{
|
|
- if (j1 <= 0 || j1 >= 255)
|
|
+ if (j1 <= 0 || j1 >= par1World.getHeight() - 1)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
i2 = par1World.getBlockId(i1, j1, k1);
|
|
|
|
- if (i2 != 0)
|
|
+ if (!par1World.isAirBlock(i1, j1, k1))
|
|
{
|
|
if (!canPushBlock(i2, par1World, i1, j1, k1, true))
|
|
{
|
|
@@ -535,7 +535,9 @@
|
|
continue;
|
|
}
|
|
|
|
- Block.blocksList[i2].dropBlockAsItem(par1World, i1, j1, k1, par1World.getBlockMetadata(i1, j1, k1), 0);
|
|
+ //With our change to how snowballs are dropped this needs to disallow to mimic vanilla behavior.
|
|
+ float chance = (Block.blocksList[i2] instanceof BlockSnow ? -1.0f : 1.0f);
|
|
+ Block.blocksList[i2].dropBlockAsItemWithChance(par1World, i1, j1, k1, par1World.getBlockMetadata(i1, j1, k1), chance, 0);
|
|
par1World.setBlockToAir(i1, j1, k1);
|
|
}
|
|
}
|