Upstream merge

By: md_5 <git@md-5.net>
This commit is contained in:
Spigot
2014-01-15 20:28:26 +11:00
parent e4f2987e65
commit 1180c5cc83
15 changed files with 47 additions and 47 deletions

View File

@@ -1,4 +1,4 @@
From 9040fcec49683449480a882231b846a099491a1f Mon Sep 17 00:00:00 2001
From 6dabb52490ee3e398dd05a60d5fb9579290babf8 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 efe7ca5..a4adc56 100644
index 2fd6a43..4473e7e 100644
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -749,6 +749,15 @@ public class Chunk {
@@ -760,6 +760,15 @@ public class Chunk {
while (iterator.hasNext()) {
TileEntity tileentity = (TileEntity) iterator.next();
@@ -25,7 +25,7 @@ index efe7ca5..a4adc56 100644
this.world.a(tileentity);
}
@@ -758,6 +767,15 @@ public class Chunk {
@@ -769,6 +778,15 @@ public class Chunk {
java.util.Iterator<Object> iter = this.entitySlices[i].iterator();
while (iter.hasNext()) {
Entity entity = (Entity) iter.next();