SteamWar/Paper
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upstream merge, lots of conflicts

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
Spigot
2014-06-22 19:25:10 +10:00
parent 07a1436667
commit 9ab31295a9
120 changed files with 252 additions and 349 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CraftBukkit-Patches/0037-Properly-Close-Inventories.patch
View File

@@ -1,4 +1,4 @@
From f6c37960464a932e6125c8bd19c8288743eb42ea Mon Sep 17 00:00:00 2001
From d35c0a27272e11eb32a8202860148c501ee2956f 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 a638dba..d0c00db 100644
index 5ef6865..d74586e 100644
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -755,6 +755,15 @@ public class Chunk {
@@ -783,6 +783,15 @@ public class Chunk {
while (iterator.hasNext()) {
TileEntity tileentity = (TileEntity) iterator.next();
@@ -25,7 +25,7 @@ index a638dba..d0c00db 100644
this.world.a(tileentity);
}
@@ -764,6 +773,15 @@ public class Chunk {
@@ -792,6 +801,15 @@ public class Chunk {
java.util.Iterator<Object> iter = this.entitySlices[i].iterator();
while (iter.hasNext()) {
Entity entity = (Entity) iter.next();