Rebuild patches

This commit is contained in:
Zach Brown 2015-05-10 19:24:52 -05:00
parent e5752934e4
commit a5b3760b6d

View File

@ -130,6 +130,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
// Spigot start // Spigot start
if (tileentity == null) { if (tileentity == null) {
getServer().getLogger().severe("Spigot has detected a null entity and has removed it, preventing a crash"); getServer().getLogger().severe("Spigot has detected a null entity and has removed it, preventing a crash");
- tilesThisCycle--;
- this.tileEntityList.remove(tileTickPosition--); - this.tileEntityList.remove(tileTickPosition--);
+ iterator.remove(); // PaperSpigot - Remove Spigot's TE handling in favor of our own + iterator.remove(); // PaperSpigot - Remove Spigot's TE handling in favor of our own
continue; continue;
@ -139,6 +140,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
} }
if (tileentity.x()) { if (tileentity.x()) {
- tilesThisCycle--;
- this.tileEntityList.remove(tileTickPosition--); - this.tileEntityList.remove(tileTickPosition--);
+ iterator.remove(); // PaperSpigot - Remove Spigot's TE handling in favor of our own + iterator.remove(); // PaperSpigot - Remove Spigot's TE handling in favor of our own
this.h.remove(tileentity); this.h.remove(tileentity);