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

Upstream merge

Browse Source 
By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-12-03 15:13:39 +11:00
parent 223fa04f6f
commit 739f396eba
17 changed files with 69 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
CraftBukkit-Patches/0054-Guard-entity-list.patch
View File

@@ -1,14 +1,14 @@
From 087cdf3dccb090d91f466081a2834de2854d307c Mon Sep 17 00:00:00 2001
From 037d74366dc04180af0676da0c4c4ecbf09046fc 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 c4978f6..81534e3 100644
index b09220f..29907b2 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;
@@ -30,7 +30,25 @@ import org.bukkit.event.weather.ThunderChangeEvent;
public abstract class World implements IBlockAccess {
public boolean d;
@@ -35,7 +35,7 @@ index c4978f6..81534e3 100644
protected List f = new ArrayList();
public Set tileEntityList = new HashSet(); // CraftBukkit - ArrayList -> HashSet
private List a = new ArrayList();
@@ -76,6 +94,7 @@ public abstract class World implements IBlockAccess {
@@ -77,6 +95,7 @@ public abstract class World implements IBlockAccess {
int[] I;
// Spigot start
@@ -43,7 +43,7 @@ index c4978f6..81534e3 100644
protected final gnu.trove.map.hash.TLongShortHashMap chunkTickList;
protected float growthOdds = 100;
protected float modifiedOdds = 100;
@@ -1256,6 +1275,7 @@ public abstract class World implements IBlockAccess {
@@ -1257,6 +1276,7 @@ public abstract class World implements IBlockAccess {
org.spigotmc.ActivationRange.activateEntities(this); // Spigot
timings.entityTick.startTiming(); // Spigot
@@ -51,7 +51,7 @@ index c4978f6..81534e3 100644
for (i = 0; i < this.entityList.size(); ++i) {
entity = (Entity) this.entityList.get(i);
@@ -1303,12 +1323,15 @@ public abstract class World implements IBlockAccess {
@@ -1304,12 +1324,15 @@ public abstract class World implements IBlockAccess {
this.getChunkAt(j, k).b(entity);
}