diff --git a/Spigot-Server-Patches/Disable-mood-sounds.patch b/Spigot-Server-Patches/Disable-mood-sounds.patch index e85b2b8268..22f2c7286d 100644 --- a/Spigot-Server-Patches/Disable-mood-sounds.patch +++ b/Spigot-Server-Patches/Disable-mood-sounds.patch @@ -32,6 +32,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + disableMoodSounds = getBoolean( "disable-mood-sounds", false ); + } } --- -1.9.5.msysgit.1 - +-- \ No newline at end of file diff --git a/Spigot-Server-Patches/FallingBlock-and-TNT-entities-collide-with-specific-.patch b/Spigot-Server-Patches/FallingBlock-and-TNT-entities-collide-with-specific-.patch index 7875bf925a..15579478f5 100644 --- a/Spigot-Server-Patches/FallingBlock-and-TNT-entities-collide-with-specific-.patch +++ b/Spigot-Server-Patches/FallingBlock-and-TNT-entities-collide-with-specific-.patch @@ -15,8 +15,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - 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)) { ++ 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)) { + AxisAlignedBB aabb = AxisAlignedBB.a(x, y, z, x + 1.0, y + 1.0, z + 1.0); + if (axisalignedbb.b(aabb)) arraylist.add(aabb); + } else { @@ -41,6 +40,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + fallingBlocksCollideWithSigns = getBoolean( "falling-blocks-collide-with-signs", false ); + } } --- -1.9.5.msysgit.1 - +-- \ No newline at end of file