core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix tripwires + minecarts

This commit is contained in:
md_5 2013-01-26 08:33:09 +11:00
parent 5742900e16
commit 3faf5e20e5
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CraftBukkit-Patches/0022-Reduce-number-of-LivingEntity-collision-checks.patch
View File

@ -1,4 +1,4 @@
From 2e2b7c86482c38d4c37f1df77509bca28655cb63 Mon Sep 17 00:00:00 2001 From 21495bd89ab6753951d9ca3ac2532d94404ab53e Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Fri, 18 Jan 2013 19:31:14 -0500 Date: Fri, 18 Jan 2013 19:31:14 -0500
Subject: [PATCH] Reduce number of LivingEntity collision checks. 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(+) 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 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 --- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/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 { @@ -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) { for (int i = 0; i < list.size(); ++i) {
Entity entity = (Entity) list.get(i); Entity entity = (Entity) list.get(i);
+ if (!(entity instanceof EntityMinecart) && skip) { continue; } // Spigot + if (!(entity instanceof EntityLiving) && skip) { continue; } // Spigot
if (entity.M()) { if (entity.M()) {
this.o(entity); this.o(entity);
} }