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

Fix a ConcurrentModificationException in the antixray

Browse Source 
By: Thinkofdeath <thinkofdeath@spigotmc.org>
This commit is contained in:
Spigot
2014-05-21 12:01:10 +01:00
parent 1fc8df93b1
commit c37f92e34d
6 changed files with 42 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CraftBukkit-Patches/0107-Guard-Entity-List.patch
View File

@@ -1,11 +1,11 @@
From 5b32db6f24afeaabf5d2d43778d4436de3cff6fc Mon Sep 17 00:00:00 2001
From 6b67defb92e04c855fb01fe6a1bddd7ebe746cd4 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 10 Mar 2014 09:03:28 +1100
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 eb6772a..121b3d5 100644
index e557b4f..091b04d 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -31,7 +31,32 @@ import org.bukkit.event.weather.ThunderChangeEvent;
@@ -50,7 +50,7 @@ index eb6772a..121b3d5 100644
protected final gnu.trove.map.hash.TLongShortHashMap chunkTickList;
protected float growthOdds = 100;
protected float modifiedOdds = 100;
@@ -1347,6 +1373,7 @@ public abstract class World implements IBlockAccess {
@@ -1354,6 +1380,7 @@ public abstract class World implements IBlockAccess {
org.spigotmc.ActivationRange.activateEntities(this); // Spigot
timings.entityTick.startTiming(); // Spigot
@@ -58,7 +58,7 @@ index eb6772a..121b3d5 100644
// CraftBukkit start - Use field for loop variable
for (this.tickPosition = 0; this.tickPosition < this.entityList.size(); ++this.tickPosition) {
entity = (Entity) this.entityList.get(this.tickPosition);
@@ -1395,12 +1422,15 @@ public abstract class World implements IBlockAccess {
@@ -1402,12 +1429,15 @@ public abstract class World implements IBlockAccess {
this.getChunkAt(j, k).b(entity);
}