Bump thread safety patch up.

By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-03-23 17:56:28 +11:00
parent 8129ed16ee
commit 8955b40968
32 changed files with 43 additions and 43 deletions

View File

@@ -1,37 +0,0 @@
From 46f4036615ca43f25d593acb0f343211a2e0fe64 Mon Sep 17 00:00:00 2001
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
index 350560e..84a2926 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -1428,12 +1428,20 @@ public abstract class EntityLiving extends Entity {
}
protected void bg() {
+ // 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);
+ if (entity instanceof EntityLiving && skip) { continue; } // Spigot
if (entity.L()) {
this.o(entity);
}
--
1.8.1-rc2