From 3faf5e20e50c99121ebbf7b4f5b1c106edc9b67f Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 26 Jan 2013 08:33:09 +1100 Subject: [PATCH] Fix tripwires + minecarts --- ...022-Reduce-number-of-LivingEntity-collision-checks.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CraftBukkit-Patches/0022-Reduce-number-of-LivingEntity-collision-checks.patch b/CraftBukkit-Patches/0022-Reduce-number-of-LivingEntity-collision-checks.patch index e78d3af7a9..97fe728823 100644 --- a/CraftBukkit-Patches/0022-Reduce-number-of-LivingEntity-collision-checks.patch +++ b/CraftBukkit-Patches/0022-Reduce-number-of-LivingEntity-collision-checks.patch @@ -1,4 +1,4 @@ -From 2e2b7c86482c38d4c37f1df77509bca28655cb63 Mon Sep 17 00:00:00 2001 +From 21495bd89ab6753951d9ca3ac2532d94404ab53e Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 18 Jan 2013 19:31:14 -0500 Subject: [PATCH] Reduce number of LivingEntity collision checks. @@ -8,7 +8,7 @@ Subject: [PATCH] Reduce number of LivingEntity collision checks. 1 file changed, 8 insertions(+) diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index b2481aa..e476393 100644 +index b2481aa..d33cfb4 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -1402,12 +1402,20 @@ public abstract class EntityLiving extends Entity { @@ -28,7 +28,7 @@ index b2481aa..e476393 100644 for (int i = 0; i < list.size(); ++i) { Entity entity = (Entity) list.get(i); -+ if (!(entity instanceof EntityMinecart) && skip) { continue; } // Spigot ++ if (!(entity instanceof EntityLiving) && skip) { continue; } // Spigot if (entity.M()) { this.o(entity); }