2013-03-15 21:35:56 +00:00
|
|
|
From 5cf1d81fb59b7d6941a6b5e502dcbcb7211fb32f Mon Sep 17 00:00:00 2001
|
2013-01-21 23:04:57 +00:00
|
|
|
From: Aikar <aikar@aikar.co>
|
|
|
|
|
Date: Fri, 18 Jan 2013 19:31:14 -0500
|
|
|
|
|
Subject: [PATCH] Reduce number of LivingEntity collision checks.
|
|
|
|
|
|
|
|
|
|
---
|
|
|
|
|
src/main/java/net/minecraft/server/EntityLiving.java | 8 ++++++++
|
|
|
|
|
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
|
2013-03-15 21:35:56 +00:00
|
|
|
index 89ce129..86a0b6d 100644
|
2013-01-21 23:04:57 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/EntityLiving.java
|
|
|
|
|
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
|
2013-03-15 21:35:56 +00:00
|
|
|
@@ -1427,12 +1427,20 @@ public abstract class EntityLiving extends Entity {
|
2013-01-21 23:04:57 +00:00
|
|
|
}
|
|
|
|
|
|
2013-03-15 21:35:56 +00:00
|
|
|
protected void bg() {
|
2013-01-21 23:04:57 +00:00
|
|
|
+ // Spigot start
|
|
|
|
|
+ boolean skip = false;
|
|
|
|
|
+ if (!(this instanceof EntityPlayer) && this.ticksLived % 2 != 0) {
|
|
|
|
|
+ skip = true;
|
|
|
|
|
+ }
|
|
|
|
|
+ // Spigot end
|
|
|
|
|
+
|
|
|
|
|
List list = this.world.getEntities(this, this.boundingBox.grow(0.20000000298023224D, 0.0D, 0.20000000298023224D));
|
|
|
|
|
|
|
|
|
|
if (list != null && !list.isEmpty()) {
|
|
|
|
|
for (int i = 0; i < list.size(); ++i) {
|
|
|
|
|
Entity entity = (Entity) list.get(i);
|
|
|
|
|
|
2013-02-19 16:43:00 +00:00
|
|
|
+ if (entity instanceof EntityLiving && skip) { continue; } // Spigot
|
2013-03-15 21:35:56 +00:00
|
|
|
if (entity.L()) {
|
2013-01-21 23:04:57 +00:00
|
|
|
this.o(entity);
|
|
|
|
|
}
|
|
|
|
|
--
|
2013-03-15 21:35:56 +00:00
|
|
|
1.8.1-rc2
|
2013-01-21 23:04:57 +00:00
|
|
|
|
