Update to Minecraft 1.10

This commit is contained in:
Zach Brown
2016-06-08 22:57:14 -05:00
parent f53bec077b
commit 9b192b2708
75 changed files with 210 additions and 422 deletions

View File

@@ -23,7 +23,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
--- a/src/main/java/net/minecraft/server/Village.java
+++ b/src/main/java/net/minecraft/server/Village.java
@@ -0,0 +0,0 @@ public class Village {
private List<Village.Aggressor> k;
private final List<Village.Aggressor> k;
private int l;
- public Village() {
@@ -31,13 +31,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
this.c = BlockPosition.ZERO;
this.d = BlockPosition.ZERO;
this.j = new TreeMap();
@@ -0,0 +0,0 @@ public class Village {
NBTTagCompound nbttagcompound2 = nbttaglist1.get(j);
if (nbttagcompound2.hasKey("UUID")) {
- UserCache usercache = this.a.getMinecraftServer().getUserCache();
+ UserCache usercache = MinecraftServer.getServer().getUserCache(); // Paper - Bandaid for world being null
GameProfile gameprofile = usercache.a(UUID.fromString(nbttagcompound2.getString("UUID")));
if (gameprofile != null) {
--