From 8ba82c550a23dcb009d9e8c98122ae8fc8c7053d Mon Sep 17 00:00:00 2001 From: Byteflux Date: Tue, 4 Aug 2015 17:24:47 -0700 Subject: [PATCH] Add chests and soul sand to list of types falling blocks can collide with --- ...lock-and-TNT-entities-collide-with-specific-.patch | 11 +++++------ Spigot-Server-Patches/0062-Disable-mood-sounds.patch | 8 ++++---- Spigot-Server-Patches/0064-Optimize-getCubes.patch | 6 +++--- 3 files changed, 12 insertions(+), 13 deletions(-) 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 c5a4546451..c26b8382b5 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 @@ -1,22 +1,21 @@ -From 36a7f30f47778a7c3d114efbad08f06c369ae7da Mon Sep 17 00:00:00 2001 +From 0e36863443cc986994e8c80ba7736b444f6fb5bf Mon Sep 17 00:00:00 2001 From: Byteflux Date: Fri, 5 Jun 2015 00:43:17 -0700 Subject: [PATCH] FallingBlock and TNT entities collide with specific blocks diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index baedb39..e96fa6f 100644 +index 26f54c8..029fc5a 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -1203,7 +1203,16 @@ public abstract class World implements IBlockAccess { +@@ -1203,7 +1203,15 @@ public abstract class World implements IBlockAccess { } if ( block != null ) { - 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 { @@ -42,5 +41,5 @@ index 37369e8..0b75e16 100644 + } } -- -1.9.5.msysgit.1 +2.4.6.windows.1 diff --git a/Spigot-Server-Patches/0062-Disable-mood-sounds.patch b/Spigot-Server-Patches/0062-Disable-mood-sounds.patch index e1d589dc4f..2865fd7acc 100644 --- a/Spigot-Server-Patches/0062-Disable-mood-sounds.patch +++ b/Spigot-Server-Patches/0062-Disable-mood-sounds.patch @@ -1,14 +1,14 @@ -From c90d97ad1e3d00db76616f1d49e415d2d86bd92b Mon Sep 17 00:00:00 2001 +From 6c20111c656352bb5d39c290223c637b1c197470 Mon Sep 17 00:00:00 2001 From: Sudzzy Date: Tue, 14 Jul 2015 09:30:28 -0700 Subject: [PATCH] Disable mood sounds diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 294f54c..eacd4b8 100644 +index 8ec26ea..65fc9c1 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -2232,7 +2232,7 @@ public abstract class World implements IBlockAccess { +@@ -2231,7 +2231,7 @@ public abstract class World implements IBlockAccess { protected void a(int i, int j, Chunk chunk) { this.methodProfiler.c("moodSound"); @@ -33,5 +33,5 @@ index 03d3705..2371123 100644 + } } -- -1.9.5.msysgit.1 +2.4.6.windows.1 diff --git a/Spigot-Server-Patches/0064-Optimize-getCubes.patch b/Spigot-Server-Patches/0064-Optimize-getCubes.patch index 33e4b54d32..d47f48b8df 100644 --- a/Spigot-Server-Patches/0064-Optimize-getCubes.patch +++ b/Spigot-Server-Patches/0064-Optimize-getCubes.patch @@ -1,11 +1,11 @@ -From 758c7bfd2f600e5bd2dec410a18106ef72704eee Mon Sep 17 00:00:00 2001 +From e20f84e870b9f6665f2b4b220e8f425c9c72200f Mon Sep 17 00:00:00 2001 From: Byteflux Date: Tue, 14 Jul 2015 10:03:45 -0700 Subject: [PATCH] Optimize getCubes() diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 1fc0387..4e8ba43 100644 +index 65fc9c1..d890a00 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1162,11 +1162,12 @@ public abstract class World implements IBlockAccess { @@ -31,7 +31,7 @@ index 1fc0387..4e8ba43 100644 // Compute ranges within chunk int xstart = ( i < cx ) ? cx : i; int xend = ( j < ( cx + 16 ) ) ? j : ( cx + 16 ); -@@ -1222,6 +1222,8 @@ public abstract class World implements IBlockAccess { +@@ -1221,6 +1221,8 @@ public abstract class World implements IBlockAccess { } // Spigot end