From de5c26123fcb6294e77ec916d91635c3f18982ee Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 27 Jul 2015 22:19:19 +1000 Subject: Update to Minecraft 1.8.8 (Pre-)Release. --- nms-patches/ChunkRegionLoader.patch | 12 ++++++------ nms-patches/CrashReport.patch | 2 +- nms-patches/DedicatedServer.patch | 2 +- nms-patches/HandshakeListener.patch | 2 +- nms-patches/PacketStatusListener.patch | 18 +++++++++++------- nms-patches/SystemUtils.patch | 11 ----------- 6 files changed, 20 insertions(+), 27 deletions(-) delete mode 100644 nms-patches/SystemUtils.patch (limited to 'nms-patches') diff --git a/nms-patches/ChunkRegionLoader.patch b/nms-patches/ChunkRegionLoader.patch index bfd9ff7c..47a50146 100644 --- a/nms-patches/ChunkRegionLoader.patch +++ b/nms-patches/ChunkRegionLoader.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/server/ChunkRegionLoader.java +++ b/net/minecraft/server/ChunkRegionLoader.java -@@ -25,7 +25,35 @@ +@@ -26,7 +26,35 @@ this.d = file; } @@ -36,7 +36,7 @@ ChunkCoordIntPair chunkcoordintpair = new ChunkCoordIntPair(i, j); NBTTagCompound nbttagcompound = (NBTTagCompound) this.b.get(chunkcoordintpair); -@@ -42,7 +70,7 @@ +@@ -43,7 +71,7 @@ return this.a(world, i, j, nbttagcompound); } @@ -45,7 +45,7 @@ if (!nbttagcompound.hasKeyOfType("Level", 10)) { ChunkRegionLoader.a.error("Chunk file at " + i + "," + j + " is missing level data, skipping"); return null; -@@ -59,10 +87,28 @@ +@@ -60,10 +88,28 @@ ChunkRegionLoader.a.error("Chunk file at " + i + "," + j + " is in the wrong location; relocating. (Expected " + i + ", " + j + ", got " + chunk.locX + ", " + chunk.locZ + ")"); nbttagcompound1.setInt("xPos", i); nbttagcompound1.setInt("zPos", j); @@ -75,7 +75,7 @@ } } } -@@ -290,7 +336,26 @@ +@@ -303,7 +349,26 @@ int k1 = l >> 4 & 15; int l1 = nibblearray1 != null ? nibblearray1.a(i1, j1, k1) : 0; @@ -103,7 +103,7 @@ } chunksection.a(achar); -@@ -308,6 +373,13 @@ +@@ -321,6 +386,13 @@ chunk.a(nbttagcompound.getByteArray("Biomes")); } @@ -117,7 +117,7 @@ NBTTagList nbttaglist1 = nbttagcompound.getList("Entities", 10); if (nbttaglist1 != null) { -@@ -366,6 +438,6 @@ +@@ -379,6 +451,6 @@ } } diff --git a/nms-patches/CrashReport.patch b/nms-patches/CrashReport.patch index 629e84ef..f0dc0645 100644 --- a/nms-patches/CrashReport.patch +++ b/nms-patches/CrashReport.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/server/CrashReport.java +++ b/net/minecraft/server/CrashReport.java -@@ -133,6 +133,7 @@ +@@ -124,6 +124,7 @@ return this.a(); } }); diff --git a/nms-patches/DedicatedServer.patch b/nms-patches/DedicatedServer.patch index b4d15779..d33c97e3 100644 --- a/nms-patches/DedicatedServer.patch +++ b/nms-patches/DedicatedServer.patch @@ -93,7 +93,7 @@ + thread.setDaemon(true); thread.start(); - DedicatedServer.LOGGER.info("Starting minecraft server version 1.8.7"); + DedicatedServer.LOGGER.info("Starting minecraft server version 1.8.8"); @@ -73,7 +120,7 @@ } diff --git a/nms-patches/HandshakeListener.patch b/nms-patches/HandshakeListener.patch index d3fb4661..67106fb4 100644 --- a/nms-patches/HandshakeListener.patch +++ b/nms-patches/HandshakeListener.patch @@ -58,7 +58,7 @@ + // CraftBukkit end + if (packethandshakinginsetprotocol.b() > 47) { - chatcomponenttext = new ChatComponentText("Outdated server! I\'m still on 1.8.7"); + chatcomponenttext = new ChatComponentText("Outdated server! I\'m still on 1.8.8"); this.b.handle(new PacketLoginOutDisconnect(chatcomponenttext)); @@ -26,6 +71,7 @@ this.b.close(chatcomponenttext); diff --git a/nms-patches/PacketStatusListener.patch b/nms-patches/PacketStatusListener.patch index 2c03b69a..36d282ec 100644 --- a/nms-patches/PacketStatusListener.patch +++ b/nms-patches/PacketStatusListener.patch @@ -16,8 +16,8 @@ + public class PacketStatusListener implements PacketStatusInListener { - private final MinecraftServer minecraftServer; -@@ -12,11 +23,116 @@ + private static final IChatBaseComponent a = new ChatComponentText("Status request has been handled."); +@@ -14,17 +25,116 @@ public void a(IChatBaseComponent ichatbasecomponent) {} @@ -29,13 +29,16 @@ + // CraftBukkit end + public void a(PacketStatusInStart packetstatusinstart) { -- this.networkManager.handle(new PacketStatusOutServerInfo(this.minecraftServer.aG())); +- if (this.d) { + // this.networkManager.handle(new PacketStatusOutServerInfo(this.minecraftServer.aG())); + // CraftBukkit start - fire ping event -+ if (state != WAITING) { -+ networkManager.close(null); ++ if (this.state != WAITING) { + this.networkManager.close(PacketStatusListener.a); +- } else { +- this.d = true; +- this.networkManager.handle(new PacketStatusOutServerInfo(this.minecraftServer.aG())); + return; -+ } + } + state = PING; + final Object[] players = minecraftServer.getPlayerList().players.toArray(); + class ServerListPingEvent extends org.bukkit.event.server.ServerListPingEvent { @@ -126,9 +129,10 @@ public void a(PacketStatusInPing packetstatusinping) { - this.networkManager.handle(new PacketStatusOutPong(packetstatusinping.a())); +- this.networkManager.close(PacketStatusListener.a); + // CraftBukkit start + if (state != PING) { -+ networkManager.close(null); ++ this.networkManager.close(PacketStatusListener.a); + return; + } + state = DONE; diff --git a/nms-patches/SystemUtils.patch b/nms-patches/SystemUtils.patch deleted file mode 100644 index 2ce12c01..00000000 --- a/nms-patches/SystemUtils.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/net/minecraft/server/SystemUtils.java -+++ b/net/minecraft/server/SystemUtils.java -@@ -32,7 +32,7 @@ - Processor[] aprocessor = (new SystemInfo()).getHardware().getProcessors(); - - SystemUtils.a = String.format("%dx %s", new Object[] { Integer.valueOf(aprocessor.length), aprocessor[0]}).replaceAll("\\s+", " "); -- } catch (Exception exception) { -+ } catch (Throwable exception) { - ; - } - -- cgit v1.2.3