From 4eadccd3e2ffc105a2e7fcf40839d7c25ebf5b2b Mon Sep 17 00:00:00 2001 From: Byteflux Date: Wed, 5 Aug 2015 02:31:55 -0700 Subject: [PATCH] Add beds and enderchests to list of collidable blocks --- ...3-FallingBlock-and-TNT-entities-collide-with-specific-.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Spigot-Server-Patches/0053-FallingBlock-and-TNT-entities-collide-with-specific-.patch b/Spigot-Server-Patches/0053-FallingBlock-and-TNT-entities-collide-with-specific-.patch index c26b8382b5..39b3fd4dfd 100644 --- a/Spigot-Server-Patches/0053-FallingBlock-and-TNT-entities-collide-with-specific-.patch +++ b/Spigot-Server-Patches/0053-FallingBlock-and-TNT-entities-collide-with-specific-.patch @@ -15,7 +15,7 @@ index 26f54c8..029fc5a 100644 - block.getBlock().a(this, blockposition, block, axisalignedbb, arraylist, entity); + // PaperSpigot start - FallingBlocks and TNT collide with specific non-collidable blocks + Block b = block.getBlock(); -+ 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)) { ++ 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 BlockBed || b instanceof BlockEnderChest)) { + AxisAlignedBB aabb = AxisAlignedBB.a(x, y, z, x + 1.0, y + 1.0, z + 1.0); + if (axisalignedbb.b(aabb)) arraylist.add(aabb); + } else {