mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Update to 1.7.5

Browse source 
By: Thinkofdeath <thethinkofdeath@gmail.com>
This commit is contained in:
Spigot 2014-03-23 00:06:43 +00:00
commit b215942177
70 changed files with 583 additions and 586 deletions
Download patch file Download diff file Expand all files Collapse all files

18
CraftBukkit-Patches/0116-Fix-ConcurrentModificationException-while-being-idle.patch
View file

@ -1,4 +1,4 @@
From 6a1f414ca1faf1148d0a2d0db1916ff043b3a834 Mon Sep 17 00:00:00 2001
From 97ded54c11639e45156c76c29d36cfbbd1610dc5 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Tue, 14 Jan 2014 20:11:25 +0000
Subject: [PATCH] Fix ConcurrentModificationException while being idle kicked
@ -6,18 +6,18 @@ Subject: [PATCH] Fix ConcurrentModificationException while being idle kicked
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index d0d9ea9..97486db 100644
index cf2245e..8aa11c2 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1045,23 +1045,24 @@ public abstract class World implements IBlockAccess {
@@ -1042,23 +1042,24 @@ public abstract class World implements IBlockAccess {
this.players.remove(entity);
this.everyoneSleeping();
}
-
- int i = entity.ai;
- int j = entity.ak;
- int i = entity.ah;
- int j = entity.aj;
-
- if (entity.ah && this.isChunkLoaded(i, j)) {
- if (entity.ag && this.isChunkLoaded(i, j)) {
- this.getChunkAt(i, j).b(entity);
- }
-
@ -28,9 +28,9 @@ index d0d9ea9..97486db 100644
- this.tickPosition--;
+ // Spigot start
+ if (!guardEntityList) { // It will get removed after the tick if we are ticking
+ int i = entity.ai;
+ int j = entity.ak;
+ if (entity.ah && this.isChunkLoaded(i, j)) {
+ int i = entity.ah;
+ int j = entity.aj;
+ if (entity.ag && this.isChunkLoaded(i, j)) {
+ this.getChunkAt(i, j).b(entity);
}
- this.entityList.remove(index);