twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-01 20:52:12 -07:00
Code Issues Packages Projects Releases Wiki Activity

Add chests and soul sand to list of types falling blocks can collide with

Browse Source
This commit is contained in:
Byteflux
2015-08-04 17:24:47 -07:00
parent 6bcae0c948
commit c92053d8b0
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Spigot-Server-Patches/Disable-mood-sounds.patch
View File

@@ -33,5 +33,3 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ } + }
} }
-- --
1.9.5.msysgit.1

5
Spigot-Server-Patches/FallingBlock-and-TNT-entities-collide-with-specific-.patch
View File

@@ -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 {
@@ -42,5 +41,3 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ } + }
} }
-- --
1.9.5.msysgit.1