diff options
author | md_5 <git@md-5.net> | 2018-12-06 10:00:00 +1100 |
---|---|---|
committer | md_5 <git@md-5.net> | 2018-12-06 10:00:00 +1100 |
commit | aa36c8417bda9bdd4812c6094895677654cff83d (patch) | |
tree | f28adbc34ebef8ef5816c95597927b4c72ba2797 /nms-patches/MinecraftServer.patch | |
parent | 20fc5bea2c51de8d5239b68d83e878896b8ff505 (diff) | |
download | craftbukkit-aa36c8417bda9bdd4812c6094895677654cff83d.tar craftbukkit-aa36c8417bda9bdd4812c6094895677654cff83d.tar.gz craftbukkit-aa36c8417bda9bdd4812c6094895677654cff83d.tar.lz craftbukkit-aa36c8417bda9bdd4812c6094895677654cff83d.tar.xz craftbukkit-aa36c8417bda9bdd4812c6094895677654cff83d.zip |
Mappings Update
Diffstat (limited to 'nms-patches/MinecraftServer.patch')
-rw-r--r-- | nms-patches/MinecraftServer.patch | 8 |
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; } |