summaryrefslogtreecommitdiffstats
path: root/nms-patches/MinecraftServer.patch
diff options
context:
space:
mode:
Diffstat (limited to 'nms-patches/MinecraftServer.patch')
-rw-r--r--nms-patches/MinecraftServer.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/nms-patches/MinecraftServer.patch b/nms-patches/MinecraftServer.patch
index ea6c46a1..c4053f53 100644
--- a/nms-patches/MinecraftServer.patch
+++ b/nms-patches/MinecraftServer.patch
@@ -261,9 +261,9 @@
- this.getPlayerList().setPlayerFileData(worldserver);
- if (worlddata.P() != null) {
-- this.aP().a(worlddata.P());
+- this.getBossBattleCustomData().a(worlddata.P());
+ if (worlddata.P() != null) {
-+ this.aP().a(worlddata.P());
++ this.getBossBattleCustomData().a(worlddata.P());
+ }
}
+ this.a(this.getDifficulty());
@@ -373,7 +373,7 @@
+ this.server.getPluginManager().callEvent(new org.bukkit.event.world.WorldLoadEvent(world.getWorld()));
+ }
+ // CraftBukkit end
- MinecraftServer.LOGGER.info("Time elapsed: {} ms", Long.valueOf(stopwatch.elapsed(TimeUnit.MILLISECONDS)));
+ MinecraftServer.LOGGER.info("Time elapsed: {} ms", stopwatch.elapsed(TimeUnit.MILLISECONDS));
Iterator iterator = DimensionManager.b().iterator();
@@ -419,6 +571,10 @@
@@ -426,7 +426,7 @@
long j = i / 50L;
+ if (server.getWarnOnOverload()) // CraftBukkit
- MinecraftServer.LOGGER.warn("Can\'t keep up! Is the server overloaded? Running {}ms or {} ticks behind", Long.valueOf(i), Long.valueOf(j));
+ MinecraftServer.LOGGER.warn("Can't keep up! Is the server overloaded? Running {}ms or {} ticks behind", i, j);
this.aa += j * 50L;
this.Q = this.aa;
}