Update to Minecraft 1.12.1

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot 2017-08-03 23:00:00 +10:00
parent 4ba3003a60
commit 0cda4f9617
19 changed files with 179 additions and 254 deletions

View file

@ -917,7 +917,7 @@
}
public boolean getHasWhitelist() {
@@ -846,26 +1308,41 @@
@@ -846,26 +1308,39 @@
}
public void u() {
@ -953,9 +953,7 @@
this.sendMessage(ichatbasecomponent, true);
}
- public ServerStatisticManager a(EntityHuman entityhuman) {
+ // CraftBukkit start
+ // PAIL: rename
- public ServerStatisticManager getStatisticManager(EntityHuman entityhuman) {
+ public ServerStatisticManager getStatisticManager(EntityPlayer entityhuman) {
UUID uuid = entityhuman.getUniqueID();
- ServerStatisticManager serverstatisticmanager = uuid == null ? null : (ServerStatisticManager) this.o.get(uuid);
@ -964,7 +962,7 @@
if (serverstatisticmanager == null) {
File file = new File(this.server.getWorldServer(0).getDataManager().getDirectory(), "stats");
@@ -881,7 +1358,7 @@
@@ -881,7 +1356,7 @@
serverstatisticmanager = new ServerStatisticManager(this.server, file1);
serverstatisticmanager.a();
@ -973,7 +971,7 @@
}
return serverstatisticmanager;
@@ -889,14 +1366,14 @@
@@ -889,14 +1364,14 @@
public AdvancementDataPlayer h(EntityPlayer entityplayer) {
UUID uuid = entityplayer.getUniqueID();
@ -990,7 +988,7 @@
}
advancementdataplayer.a(entityplayer);
@@ -909,8 +1386,10 @@
@@ -909,8 +1384,10 @@
WorldServer[] aworldserver = this.server.worldServer;
int j = aworldserver.length;
@ -1003,7 +1001,7 @@
if (worldserver != null) {
worldserver.getPlayerChunkMap().a(i);
@@ -934,13 +1413,20 @@
@@ -934,13 +1411,20 @@
}
public void reload() {