Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-22 02:25:28 +01:00
Code Issues Projects Releases Wiki Activity

Fix logic error with living entity collision reduction.

Browse Source 
The previous version missed the entire point of the change and made it only skip collision on NON living entities... which is not often at all.

It was meant to only Skip Living->Living, or else we won't get any gain...
This commit is contained in:
Aikar 2013-02-19 11:43:00 -05:00 committed by md_5
parent 3f62bda4a9
commit 8fa6448620
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CraftBukkit-Patches/0020-Reduce-number-of-LivingEntity-collision-checks.patch
View File

@ -1,4 +1,4 @@
From 3a77832f283c73ab7a576ada6942ddd35ebe7178 Mon Sep 17 00:00:00 2001 From e9079818151c8df92e2d927b0f4f3308d9cea113 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..d33cfb4 100644 index b2481aa..bbbb008 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,10 +28,10 @@ index b2481aa..d33cfb4 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 EntityLiving) && skip) { continue; } // Spigot + if (entity instanceof EntityLiving && skip) { continue; } // Spigot
if (entity.M()) { if (entity.M()) {
this.o(entity); this.o(entity);
} }
-- --
1.8.1-rc2 1.8.1.1