Update SpigotMC's patches

5a0150f586ed3eb15fe6f1f596d1a5a7d806f0f9 Fix ITEM_BREAK
e6a3911057bd94d8bd7021cbb4923fb84fb106d1 Upstream merge
d1cdcf8d4c3639f956474f02ed662517cffbe23e Remove old patch
068df64aeee368377e1673667bffc7a6dcf90554 Rebuild all patches
This commit is contained in:
Zach Brown
2014-11-30 16:16:48 -06:00
parent af814004a5
commit 19972e09b8
191 changed files with 409 additions and 421 deletions

View File

@@ -1,4 +1,4 @@
From 2317d87940f106c27011d4246d99e6e074d15acd Mon Sep 17 00:00:00 2001
From 8166c17bd5628962813018cbd3f08e0e9f00403d 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 703b919..d525845 100644
index d2168c6..f0cf82d 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1031,6 +1031,7 @@ public abstract class World implements IBlockAccess {
@@ -1044,6 +1044,7 @@ public abstract class World implements IBlockAccess {
this.everyoneSleeping();
}
@@ -17,7 +17,7 @@ index 703b919..d525845 100644
int i = entity.ae;
int j = entity.ag;
@@ -1047,6 +1048,7 @@ public abstract class World implements IBlockAccess {
@@ -1060,6 +1061,7 @@ public abstract class World implements IBlockAccess {
this.entityList.remove(index);
}
// CraftBukkit end