mirror of
https://github.com/PaperMC/Paper.git
synced 2025-07-31 20:22:05 -07:00
Add chests and soul sand to list of types falling blocks can collide with
This commit is contained in:
@@ -32,6 +32,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||||||
+ disableMoodSounds = getBoolean( "disable-mood-sounds", false );
|
+ disableMoodSounds = getBoolean( "disable-mood-sounds", false );
|
||||||
+ }
|
+ }
|
||||||
}
|
}
|
||||||
--
|
--
|
||||||
1.9.5.msysgit.1
|
|
||||||
|
|
@@ -15,8 +15,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||||||
- block.getBlock().a(this, blockposition, block, axisalignedbb, arraylist, entity);
|
- block.getBlock().a(this, blockposition, block, axisalignedbb, arraylist, entity);
|
||||||
+ // PaperSpigot start - FallingBlocks and TNT collide with specific non-collidable blocks
|
+ // PaperSpigot start - FallingBlocks and TNT collide with specific non-collidable blocks
|
||||||
+ Block b = block.getBlock();
|
+ Block b = block.getBlock();
|
||||||
+ if (entity.world.paperSpigotConfig.fallingBlocksCollideWithSigns && (entity instanceof EntityTNTPrimed || entity instanceof EntityFallingBlock) &&
|
+ if (entity.world.paperSpigotConfig.fallingBlocksCollideWithSigns && (entity instanceof EntityTNTPrimed || entity instanceof EntityFallingBlock) && (b instanceof BlockSign || b instanceof BlockFenceGate || b instanceof BlockTorch || b instanceof BlockButtonAbstract || b instanceof BlockLever || b instanceof BlockTripwireHook || b instanceof BlockTripwire || b instanceof BlockChest || b instanceof BlockSlowSand)) {
|
||||||
+ (b instanceof BlockSign || b instanceof BlockFenceGate || b instanceof BlockTorch || b instanceof BlockButtonAbstract || b instanceof BlockLever || b instanceof BlockTripwireHook || b instanceof BlockTripwire)) {
|
|
||||||
+ AxisAlignedBB aabb = AxisAlignedBB.a(x, y, z, x + 1.0, y + 1.0, z + 1.0);
|
+ AxisAlignedBB aabb = AxisAlignedBB.a(x, y, z, x + 1.0, y + 1.0, z + 1.0);
|
||||||
+ if (axisalignedbb.b(aabb)) arraylist.add(aabb);
|
+ if (axisalignedbb.b(aabb)) arraylist.add(aabb);
|
||||||
+ } else {
|
+ } else {
|
||||||
@@ -41,6 +40,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||||||
+ fallingBlocksCollideWithSigns = getBoolean( "falling-blocks-collide-with-signs", false );
|
+ fallingBlocksCollideWithSigns = getBoolean( "falling-blocks-collide-with-signs", false );
|
||||||
+ }
|
+ }
|
||||||
}
|
}
|
||||||
--
|
--
|
||||||
1.9.5.msysgit.1
|
|
||||||
|
|
Reference in New Issue
Block a user