From f1226f6e13afefd864031876f6be79da4bcf9244 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 2 Jul 2013 15:14:02 +1000 Subject: [PATCH] Fix /reload not functioning - thanks AlexM850 for the report. --- CraftBukkit-Patches/0024-Netty.patch | 9 +++++---- CraftBukkit-Patches/0029-BungeeCord-Support.patch | 8 ++++---- CraftBukkit-Patches/0047-Spam-Filter-Exclusions.patch | 6 +++--- .../0048-Allow-Disabling-of-Command-Logging.patch | 6 +++--- .../0049-Allow-Disabling-of-Command-TabComplete.patch | 6 +++--- CraftBukkit-Patches/0050-Configurable-Messages.patch | 6 +++--- CraftBukkit-Patches/0052-Add-Log-Filtering.patch | 6 +++--- 7 files changed, 24 insertions(+), 23 deletions(-) diff --git a/CraftBukkit-Patches/0024-Netty.patch b/CraftBukkit-Patches/0024-Netty.patch index 93e2bae5a..2f8fc3ee6 100644 --- a/CraftBukkit-Patches/0024-Netty.patch +++ b/CraftBukkit-Patches/0024-Netty.patch @@ -1,4 +1,4 @@ -From dec4a7481c02848ccfee73ae5800132d7480268f Mon Sep 17 00:00:00 2001 +From fa195fe18b0b0c58a7c161ebebafed2f75d91da7 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 2 Jul 2013 09:06:29 +1000 Subject: [PATCH] Netty @@ -168,7 +168,7 @@ index 252cea7..d07973d 100644 this.b = true; } catch (Exception exception) { diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index a0a7790..c6ec91b 100644 +index a0a7790..8efdca6 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java @@ -6,6 +6,8 @@ import java.io.IOException; @@ -180,7 +180,7 @@ index a0a7790..c6ec91b 100644 import java.util.HashMap; import java.util.List; import java.util.Map; -@@ -148,4 +150,61 @@ public class SpigotConfig +@@ -148,4 +150,62 @@ public class SpigotConfig commands.put( "restart", new RestartCommand( "restart" ) ); WatchdogThread.doStart( timeoutTime, restartOnCrash ); } @@ -203,9 +203,10 @@ index a0a7790..c6ec91b 100644 + } + public static List listeners = new ArrayList(); + public static int nettyThreads; -+ + private static void listeners() + { ++ listeners.clear(); // We don't rebuild listeners on reload but we should clear them out! ++ + Map def = new HashMap(); + def.put( "host", "default" ); + def.put( "port", "default" ); diff --git a/CraftBukkit-Patches/0029-BungeeCord-Support.patch b/CraftBukkit-Patches/0029-BungeeCord-Support.patch index ec70b112f..1068941e8 100644 --- a/CraftBukkit-Patches/0029-BungeeCord-Support.patch +++ b/CraftBukkit-Patches/0029-BungeeCord-Support.patch @@ -1,4 +1,4 @@ -From e1c6cc3bbcf26863c1d30d4e73e116dbbcd523c7 Mon Sep 17 00:00:00 2001 +From 8c072aae86a7dbaf86b3bbf86da59e9d36ac9d82 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 23 Mar 2013 11:15:11 +1100 Subject: [PATCH] BungeeCord Support @@ -6,7 +6,7 @@ Subject: [PATCH] BungeeCord Support - Allows BungeeCord to set the players real IP address very early in the login process, so that the BungeeCord proxy IP is never even seen by a plugin. diff --git a/src/main/java/net/minecraft/server/PendingConnection.java b/src/main/java/net/minecraft/server/PendingConnection.java -index d0ccbff..6308331 100644 +index d07973d..b5c305b 100644 --- a/src/main/java/net/minecraft/server/PendingConnection.java +++ b/src/main/java/net/minecraft/server/PendingConnection.java @@ -227,4 +227,17 @@ public class PendingConnection extends Connection { @@ -75,7 +75,7 @@ index b3bb702..b81a07e 100644 public Spigot spigot() diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index c6ec91b..31ba25f 100644 +index 8efdca6..a7bc48b 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java @@ -7,6 +7,7 @@ import java.lang.reflect.InvocationTargetException; @@ -86,7 +86,7 @@ index c6ec91b..31ba25f 100644 import java.util.Collections; import java.util.HashMap; import java.util.List; -@@ -207,4 +208,14 @@ public class SpigotConfig +@@ -208,4 +209,14 @@ public class SpigotConfig nettyThreads = getInt( "settings.netty-threads", 3 ); } diff --git a/CraftBukkit-Patches/0047-Spam-Filter-Exclusions.patch b/CraftBukkit-Patches/0047-Spam-Filter-Exclusions.patch index 5c000a3f6..4100d6437 100644 --- a/CraftBukkit-Patches/0047-Spam-Filter-Exclusions.patch +++ b/CraftBukkit-Patches/0047-Spam-Filter-Exclusions.patch @@ -1,4 +1,4 @@ -From e630d3e3ed63f506baaffcd434033ed6c58b536f Mon Sep 17 00:00:00 2001 +From f773330e5a2472fae25d33a881de951c15f82d3e Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 21 Jun 2013 17:59:22 +1000 Subject: [PATCH] Spam Filter Exclusions @@ -28,10 +28,10 @@ index 1422d67..fc174b2 100644 Waitable waitable = new Waitable() { @Override diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index 31ba25f..1eacf1e 100644 +index a7bc48b..a3d3a7b 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java -@@ -218,4 +218,13 @@ public class SpigotConfig +@@ -219,4 +219,13 @@ public class SpigotConfig bungeeAddresses = getList( "settings.bungeecord-addresses", bungeeAddresses ); bungee = getBoolean( "settings.bungeecord", true ); } diff --git a/CraftBukkit-Patches/0048-Allow-Disabling-of-Command-Logging.patch b/CraftBukkit-Patches/0048-Allow-Disabling-of-Command-Logging.patch index 3e661ac99..bfbdc4d56 100644 --- a/CraftBukkit-Patches/0048-Allow-Disabling-of-Command-Logging.patch +++ b/CraftBukkit-Patches/0048-Allow-Disabling-of-Command-Logging.patch @@ -1,4 +1,4 @@ -From 59ccb1461adc862cdda4770df025044de024cec0 Mon Sep 17 00:00:00 2001 +From e2659f584c9a26dba16a01be9b76f9e61bde72a5 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 21 Jun 2013 18:01:29 +1000 Subject: [PATCH] Allow Disabling of Command Logging @@ -23,10 +23,10 @@ index fc174b2..c2a9878 100644 org.bukkit.craftbukkit.SpigotTimings.playerCommandTimer.stopTiming(); // Spigot return; diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index 1eacf1e..72300c9 100644 +index a3d3a7b..0188a98 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java -@@ -227,4 +227,10 @@ public class SpigotConfig +@@ -228,4 +228,10 @@ public class SpigotConfig "/skill" } ) ); } diff --git a/CraftBukkit-Patches/0049-Allow-Disabling-of-Command-TabComplete.patch b/CraftBukkit-Patches/0049-Allow-Disabling-of-Command-TabComplete.patch index 5913ef29f..ade2736c8 100644 --- a/CraftBukkit-Patches/0049-Allow-Disabling-of-Command-TabComplete.patch +++ b/CraftBukkit-Patches/0049-Allow-Disabling-of-Command-TabComplete.patch @@ -1,4 +1,4 @@ -From 7b02d5d839cb7c08670356dceb7875ceb4527415 Mon Sep 17 00:00:00 2001 +From c99635176c037bf74ff31cb6a56ea52a1d1be752 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 21 Jun 2013 18:05:54 +1000 Subject: [PATCH] Allow Disabling of Command TabComplete @@ -18,10 +18,10 @@ index bcbf8d7..def0519 100644 player.sendMessage(ChatColor.RED + "An internal error occurred while attempting to tab-complete this command"); getLogger().log(Level.SEVERE, "Exception when " + player.getName() + " attempted to tab complete " + message, ex); diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index 72300c9..56204cf 100644 +index 0188a98..fff8c02 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java -@@ -233,4 +233,10 @@ public class SpigotConfig +@@ -234,4 +234,10 @@ public class SpigotConfig { logCommands = getBoolean( "commands.log", true ); } diff --git a/CraftBukkit-Patches/0050-Configurable-Messages.patch b/CraftBukkit-Patches/0050-Configurable-Messages.patch index cf846f13d..e229a50f1 100644 --- a/CraftBukkit-Patches/0050-Configurable-Messages.patch +++ b/CraftBukkit-Patches/0050-Configurable-Messages.patch @@ -1,4 +1,4 @@ -From 757cc580f167ab1fc7a99ddb1fa8a3f352eabfa8 Mon Sep 17 00:00:00 2001 +From 9630657d94dc1b99321e2c7ed729d386c1bc1286 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 21 Jun 2013 19:21:58 +1000 Subject: [PATCH] Configurable Messages @@ -40,7 +40,7 @@ index def0519..58da9cb 100644 return false; } diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index 56204cf..7aac2de 100644 +index fff8c02..d2058f3 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java @@ -15,6 +15,7 @@ import java.util.Map; @@ -51,7 +51,7 @@ index 56204cf..7aac2de 100644 import org.bukkit.command.Command; import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.craftbukkit.command.TicksPerSecondCommand; -@@ -239,4 +240,18 @@ public class SpigotConfig +@@ -240,4 +241,18 @@ public class SpigotConfig { tabComplete = getBoolean( "commands.tab-complete", true ); } diff --git a/CraftBukkit-Patches/0052-Add-Log-Filtering.patch b/CraftBukkit-Patches/0052-Add-Log-Filtering.patch index 0c17d3b1e..16a4a9dd1 100644 --- a/CraftBukkit-Patches/0052-Add-Log-Filtering.patch +++ b/CraftBukkit-Patches/0052-Add-Log-Filtering.patch @@ -1,4 +1,4 @@ -From bf4cb383481236a4235a2ae958a985e47e668cbe Mon Sep 17 00:00:00 2001 +From 625a88686e7b0a6f24c79b5ae777d02a32e9cbcd Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 22 Jun 2013 16:40:11 +1000 Subject: [PATCH] Add Log Filtering @@ -35,7 +35,7 @@ index 0000000..aa7e9ab + } +} diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index 7aac2de..1f949f9 100644 +index d2058f3..e8039d7 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java @@ -13,6 +13,8 @@ import java.util.HashMap; @@ -47,7 +47,7 @@ index 7aac2de..1f949f9 100644 import net.minecraft.server.MinecraftServer; import org.bukkit.Bukkit; import org.bukkit.ChatColor; -@@ -254,4 +256,27 @@ public class SpigotConfig +@@ -255,4 +257,27 @@ public class SpigotConfig unknownCommandMessage = transform( getString( "messages.unknown-command", "Unknown command. Type \"help\" for help." ) ); serverFullMessage = transform( getString( "messages.server-full", "The server is full!" ) ); }