Upstream Merge

By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-08-04 08:51:09 +10:00
parent 4d8ae2cd25
commit eb9d70ade9
11 changed files with 41 additions and 39 deletions

View File

@@ -1,4 +1,4 @@
From a813b607d41bfb17c13c0e57f90c55cf57e5c7b3 Mon Sep 17 00:00:00 2001
From 24d31e902cd21b4851964186fefa7f4b6ded271e Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Thu, 27 Jun 2013 17:26:09 +1000
Subject: [PATCH] Properly Close Inventories
@@ -6,10 +6,10 @@ Subject: [PATCH] Properly Close Inventories
Properly close inventories when unloading and switching worlds.
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
index 51db2db..0e7e09f 100644
index c353b29..dc20587 100644
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -690,6 +690,15 @@ public class Chunk {
@@ -704,6 +704,15 @@ public class Chunk {
while (iterator.hasNext()) {
TileEntity tileentity = (TileEntity) iterator.next();
@@ -25,7 +25,7 @@ index 51db2db..0e7e09f 100644
this.world.a(tileentity);
}
@@ -699,6 +708,15 @@ public class Chunk {
@@ -713,6 +722,15 @@ public class Chunk {
java.util.Iterator<Object> iter = this.entitySlices[i].iterator();
while (iter.hasNext()) {
Entity entity = (Entity) iter.next();