SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Fix issue with chunk caching patch"

Browse Source 
This reverts commit f11258ccde.

By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-08-27 19:17:39 +10:00
parent bf0826ad5f
commit 45a9f75d56
2 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
CraftBukkit-Patches/0069-Guard-entity-list.patch
View File

@@ -1,11 +1,11 @@
From a8c4b252bda955ac01b33f738537bbe645d9482a Mon Sep 17 00:00:00 2001
From b39f6fbc48f5566ccaf1045c2d11dbc4e352ed63 Mon Sep 17 00:00:00 2001
From: Ammar Askar <ammar@ammaraskar.com>
Date: Sat, 3 Aug 2013 21:42:00 +0500
Subject: [PATCH] Guard entity list
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 52694f1..f06a8df 100644
index ba1c1ca..c03e274 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -29,7 +29,25 @@ import org.bukkit.event.weather.ThunderChangeEvent;
@@ -51,11 +51,10 @@ index 52694f1..f06a8df 100644
for (i = 0; i < this.entityList.size(); ++i) {
entity = (Entity) this.entityList.get(i);
@@ -1331,14 +1351,16 @@ public abstract class World implements IBlockAccess {
if (entity.ai && this.isChunkLoaded(j, k)) {
@@ -1332,12 +1352,15 @@ public abstract class World implements IBlockAccess {
this.getChunkAt(j, k).b(entity);
}
-
+ guardEntityList = false; // Spigot
this.entityList.remove(i--);
+ guardEntityList = true; // Spigot
@@ -64,7 +63,6 @@ index 52694f1..f06a8df 100644
this.methodProfiler.b();
}
lastChunk = Long.MIN_VALUE; // Spigot
+ guardEntityList = false; // Spigot
timings.entityTick.stopTiming(); // Spigot