Repo-Mirror/OldSliceMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Upstream merge

Browse Source
This commit is contained in:
Thinkofdeath
2015-03-16 10:19:21 +00:00
committed by Zach Brown
parent 4b61cd6e60
commit ab519bd34b
24 changed files with 193 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CraftBukkit-Patches/0093-Fix-ConcurrentModificationException-while-being-idle.patch
View File

@@ -1,4 +1,4 @@
From f7c679145cbad061ad38ddbae66acd237f283799 Mon Sep 17 00:00:00 2001
From 35bfd36fe3a58d003058f45666d66b23d2c307a1 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,10 +6,10 @@ 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 8d6aa7a..3c4c0fe 100644
index ecdebeb..776830a 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1090,6 +1090,7 @@ public abstract class World implements IBlockAccess {
@@ -1093,6 +1093,7 @@ public abstract class World implements IBlockAccess {
this.everyoneSleeping();
}
@@ -17,7 +17,7 @@ index 8d6aa7a..3c4c0fe 100644
int i = entity.ae;
int j = entity.ag;
@@ -1106,6 +1107,7 @@ public abstract class World implements IBlockAccess {
@@ -1109,6 +1110,7 @@ public abstract class World implements IBlockAccess {
this.entityList.remove(index);
}
// CraftBukkit end