From a5bd933c3a850d47fa14af960824e4f4df92a456 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 5 Jun 2015 20:56:58 +1000 Subject: [PATCH] Update to Minecraft 1.8.7 --- Bukkit-Patches/0001-POM-Changes.patch | 6 +++--- CraftBukkit-Patches/0001-POM-Changes.patch | 6 +++--- CraftBukkit-Patches/0029-Configurable-Messages.patch | 12 ++++++------ .../0073-Highly-Optimized-Tick-Loop.patch | 8 ++++---- ...inalize-the-isDisconnected-method-by-bukkit.patch | 6 +++--- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Bukkit-Patches/0001-POM-Changes.patch b/Bukkit-Patches/0001-POM-Changes.patch index 3d85533..37be288 100644 --- a/Bukkit-Patches/0001-POM-Changes.patch +++ b/Bukkit-Patches/0001-POM-Changes.patch @@ -1,11 +1,11 @@ -From 8a45243cbfa1e3db958002fe4f0c24d4c2f3f159 Mon Sep 17 00:00:00 2001 +From da920140348518cc56573db48a2e19fcbdc1b96a Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Jun 2013 10:36:24 +1000 Subject: [PATCH] POM Changes diff --git a/pom.xml b/pom.xml -index ed68803..2cc6c69 100644 +index 6f1dc61..dc430c0 100644 --- a/pom.xml +++ b/pom.xml @@ -9,14 +9,14 @@ @@ -16,7 +16,7 @@ index ed68803..2cc6c69 100644 - bukkit + org.spigotmc + spigot-api - 1.8.6-R0.1-SNAPSHOT + 1.8.7-R0.1-SNAPSHOT jar - Bukkit diff --git a/CraftBukkit-Patches/0001-POM-Changes.patch b/CraftBukkit-Patches/0001-POM-Changes.patch index c84f053..7974a72 100644 --- a/CraftBukkit-Patches/0001-POM-Changes.patch +++ b/CraftBukkit-Patches/0001-POM-Changes.patch @@ -1,4 +1,4 @@ -From 97e0492b1f6b41154e95116b9a01bc14159320aa Mon Sep 17 00:00:00 2001 +From c579a83622e1fce7be3620a36c86b763eedd06fc Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 2 Jul 2013 13:07:39 +1000 Subject: [PATCH] POM Changes @@ -6,7 +6,7 @@ Subject: [PATCH] POM Changes Basic changes to the build system which mark the artifact as Spigot, and the necessary code changes to ensure proper functionality. Also disables the auto updater provided by CraftBukkit as it is useless to us. diff --git a/pom.xml b/pom.xml -index 5ad55dc..99fe937 100644 +index 2c04579..0e0fd09 100644 --- a/pom.xml +++ b/pom.xml @@ -1,12 +1,12 @@ @@ -18,7 +18,7 @@ index 5ad55dc..99fe937 100644 + org.spigotmc + spigot jar - 1.8.6-R0.1-SNAPSHOT + 1.8.7-R0.1-SNAPSHOT - CraftBukkit - http://www.bukkit.org + Spigot diff --git a/CraftBukkit-Patches/0029-Configurable-Messages.patch b/CraftBukkit-Patches/0029-Configurable-Messages.patch index ae9cdf4..fef8be0 100644 --- a/CraftBukkit-Patches/0029-Configurable-Messages.patch +++ b/CraftBukkit-Patches/0029-Configurable-Messages.patch @@ -1,24 +1,24 @@ -From 5a66b8f6c5c8f495f0857ffbb58dfd3e47fa5756 Mon Sep 17 00:00:00 2001 +From 5b465d6f2d3e0dc00095e4a862b2a7c35818ba67 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 21 Jun 2013 19:21:58 +1000 Subject: [PATCH] Configurable Messages diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java -index 796d3d3..d0374d0 100644 +index 3b6a514..fcfdb65 100644 --- a/src/main/java/net/minecraft/server/HandshakeListener.java +++ b/src/main/java/net/minecraft/server/HandshakeListener.java @@ -62,11 +62,11 @@ public class HandshakeListener implements PacketHandshakingInListener { // CraftBukkit end if (packethandshakinginsetprotocol.b() > 47) { -- chatcomponenttext = new ChatComponentText("Outdated server! I\'m still on 1.8.6"); -+ chatcomponenttext = new ChatComponentText( java.text.MessageFormat.format( org.spigotmc.SpigotConfig.outdatedServerMessage, "1.8.6" ) ); // Spigot +- chatcomponenttext = new ChatComponentText("Outdated server! I\'m still on 1.8.7"); ++ chatcomponenttext = new ChatComponentText( java.text.MessageFormat.format( org.spigotmc.SpigotConfig.outdatedServerMessage, "1.8.7" ) ); // Spigot this.b.handle(new PacketLoginOutDisconnect(chatcomponenttext)); this.b.close(chatcomponenttext); } else if (packethandshakinginsetprotocol.b() < 47) { -- chatcomponenttext = new ChatComponentText("Outdated client! Please use 1.8.6"); -+ chatcomponenttext = new ChatComponentText( java.text.MessageFormat.format( org.spigotmc.SpigotConfig.outdatedClientMessage, "1.8.6" ) ); // Spigot +- chatcomponenttext = new ChatComponentText("Outdated client! Please use 1.8.7"); ++ chatcomponenttext = new ChatComponentText( java.text.MessageFormat.format( org.spigotmc.SpigotConfig.outdatedClientMessage, "1.8.7" ) ); // Spigot this.b.handle(new PacketLoginOutDisconnect(chatcomponenttext)); this.b.close(chatcomponenttext); } else { diff --git a/CraftBukkit-Patches/0073-Highly-Optimized-Tick-Loop.patch b/CraftBukkit-Patches/0073-Highly-Optimized-Tick-Loop.patch index 8c5f1c6..5ddee68 100644 --- a/CraftBukkit-Patches/0073-Highly-Optimized-Tick-Loop.patch +++ b/CraftBukkit-Patches/0073-Highly-Optimized-Tick-Loop.patch @@ -1,11 +1,11 @@ -From 02bf7bff7f53ec05701038c693e28e5f983b9bcd Mon Sep 17 00:00:00 2001 +From 30ce706a8813d7c9c7c7afa090e92b67f0463fe0 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 25 Jan 2014 14:08:35 +1100 Subject: [PATCH] Highly Optimized Tick Loop diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 7060622..b61af44 100644 +index 48371bc..5ae016a 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -120,6 +120,12 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs @@ -36,7 +36,7 @@ index 7060622..b61af44 100644 try { if (this.init()) { @@ -513,38 +526,34 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs - this.r.setServerInfo(new ServerPing.ServerData("1.8.6", 47)); + this.r.setServerInfo(new ServerPing.ServerData("1.8.7", 47)); this.a(this.r); + // Spigot start @@ -161,5 +161,5 @@ index 0000000..be2e31d + } +} -- -1.9.0.msysgit.0 +2.1.4 diff --git a/CraftBukkit-Patches/0086-Unfinalize-the-isDisconnected-method-by-bukkit.patch b/CraftBukkit-Patches/0086-Unfinalize-the-isDisconnected-method-by-bukkit.patch index daeeb11..d0da065 100644 --- a/CraftBukkit-Patches/0086-Unfinalize-the-isDisconnected-method-by-bukkit.patch +++ b/CraftBukkit-Patches/0086-Unfinalize-the-isDisconnected-method-by-bukkit.patch @@ -1,4 +1,4 @@ -From f7af7562a24c4e18e0326390ecbe995ff26c1cc0 Mon Sep 17 00:00:00 2001 +From a6d14a071893aac9f8e51430799e821d78f2a2bb Mon Sep 17 00:00:00 2001 From: hcherndon Date: Sat, 15 Feb 2014 01:51:20 -0600 Subject: [PATCH] Unfinalize the isDisconnected() method by bukkit. @@ -6,10 +6,10 @@ Subject: [PATCH] Unfinalize the isDisconnected() method by bukkit. This would literally mean the world to me. You have no idea how much this method being final is fucking me over right now. (Working with NPC's and what not.) diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index add3c88..d8f5480 100644 +index 26fc3b8..c1535f9 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -2059,7 +2059,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList +@@ -2060,7 +2060,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList } // CraftBukkit start - Add "isDisconnected" method