Update from upstream SpigotMC

eb39b4729ce
59b08be5833
a723278f74a
This commit is contained in:
Zach Brown
2015-01-04 20:01:24 -06:00
parent b7fb738d91
commit 1e81634a9d
6 changed files with 6 additions and 19 deletions

View File

@@ -17,13 +17,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
private Map d = Maps.newHashMap();
public PersistentCollection(IDataManager idatamanager) {
@@ -0,0 +0,0 @@ public class PersistentCollection {
return oshort.shortValue();
}
}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/World.java