From 09626243976ffe324a611b3fd6fa0a154640a586 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 21 Jun 2013 19:08:32 +1000 Subject: [PATCH] Progress on actually getting stuff to load. --- .../0004-Spigot-Configuration.patch | 58 ++++++++++--------- .../0009-Proxy-IP-Filter.patch | 6 +- .../0017-Highly-Optimized-Tick-Loop.patch | 8 +-- CraftBukkit-Patches/0023-Metrics.patch | 16 ++--- .../0024-Watchdog-Thread.patch | 6 +- CraftBukkit-Patches/0025-Netty.patch | 14 ++--- .../0030-BungeeCord-Support.patch | 6 +- .../0035-Close-Unloaded-Save-Files.patch | 6 +- ...48-Do-Not-Search-for-Offline-Players.patch | 6 +- .../0050-Spam-Filter-Exclusions.patch | 6 +- ...1-Allow-Disabling-of-Command-Logging.patch | 6 +- ...low-Disabling-of-Command-TabComplete.patch | 10 ++-- 12 files changed, 75 insertions(+), 73 deletions(-) diff --git a/CraftBukkit-Patches/0004-Spigot-Configuration.patch b/CraftBukkit-Patches/0004-Spigot-Configuration.patch index 32fcc91098..8c58aea3b1 100644 --- a/CraftBukkit-Patches/0004-Spigot-Configuration.patch +++ b/CraftBukkit-Patches/0004-Spigot-Configuration.patch @@ -1,21 +1,33 @@ -From 2a46e61b8c7c63a3940bc25f28203b159bbb7c1c Mon Sep 17 00:00:00 2001 +From dc35d23de6e9199f9e1636f0c9e4e44e510513fa Mon Sep 17 00:00:00 2001 From: md_5 -Date: Thu, 20 Jun 2013 17:35:57 +1000 +Date: Fri, 21 Jun 2013 19:06:58 +1000 Subject: [PATCH] Spigot Configuration diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index 7261dc9..6668b7e 100644 +index 7261dc9..2d638c0 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java -@@ -47,6 +47,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer - System.setOut(new PrintStream(new LoggerOutputStream(this.getLogger().getLogger(), Level.INFO), true)); - System.setErr(new PrintStream(new LoggerOutputStream(this.getLogger().getLogger(), Level.SEVERE), true)); - // CraftBukkit end -+ org.spigotmc.SpigotConfig.init(); // Spigot +@@ -89,6 +89,10 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer + if (this.G() < 0) { + this.setPort(this.propertyManager.getInt("server-port", 25565)); + } ++ // Spigot start ++ this.a((PlayerList) (new DedicatedPlayerList(this))); ++ org.spigotmc.SpigotConfig.init(); ++ // Spigot end - this.getLogger().info("Starting minecraft server version 1.5.2"); - if (Runtime.getRuntime().maxMemory() / 1024L / 1024L < 512L) { + this.getLogger().info("Generating keypair"); + this.a(MinecraftEncryption.b()); +@@ -103,7 +107,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer + return false; + } + +- this.a((PlayerList) (new DedicatedPlayerList(this))); // CraftBukkit ++ // this.a((PlayerList) (new DedicatedPlayerList(this))); // Spigot - Moved up + + if (!this.getOnlineMode()) { + this.getLogger().warning("**** SERVER IS RUNNING IN OFFLINE/INSECURE MODE!"); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java index 3a4ddea..de052bd 100644 --- a/src/main/java/net/minecraft/server/World.java @@ -37,19 +49,18 @@ index 3a4ddea..de052bd 100644 this.world = new CraftWorld((WorldServer) this, gen, env); this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 00326c1..92c6c88 100644 +index 00326c1..24f1f39 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -213,7 +213,7 @@ public final class CraftServer implements Server { +@@ -213,7 +213,6 @@ public final class CraftServer implements Server { updater.getOnBroken().addAll(configuration.getStringList("auto-updater.on-broken")); updater.getOnUpdate().addAll(configuration.getStringList("auto-updater.on-update")); updater.check(serverVersion); - -+ org.spigotmc.SpigotConfig.registerCommands( commandMap ); // Spigot loadPlugins(); enablePlugins(PluginLoadOrder.STARTUP); } -@@ -556,6 +556,7 @@ public final class CraftServer implements Server { +@@ -556,6 +555,7 @@ public final class CraftServer implements Server { playerList.getIPBans().load(); playerList.getNameBans().load(); @@ -57,7 +68,7 @@ index 00326c1..92c6c88 100644 for (WorldServer world : console.worlds) { world.difficulty = difficulty; world.setSpawnFlags(monsters, animals); -@@ -570,12 +571,14 @@ public final class CraftServer implements Server { +@@ -570,6 +570,7 @@ public final class CraftServer implements Server { } else { world.ticksPerMonsterSpawns = this.getTicksPerMonsterSpawns(); } @@ -65,19 +76,12 @@ index 00326c1..92c6c88 100644 } pluginManager.clearPlugins(); - commandMap.clearCommands(); - resetRecipes(); - -+ org.spigotmc.SpigotConfig.registerCommands( commandMap ); // Spigot - int pollCount = 0; - - // Wait for at most 2.5 seconds for plugins to close their threads diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java new file mode 100644 -index 0000000..629224d +index 0000000..c532dc7 --- /dev/null +++ b/src/main/java/org/spigotmc/SpigotConfig.java -@@ -0,0 +1,113 @@ +@@ -0,0 +1,111 @@ +package org.spigotmc; + +import com.google.common.base.Throwables; @@ -90,6 +94,7 @@ index 0000000..629224d +import java.util.List; +import java.util.Map; +import java.util.logging.Level; ++import net.minecraft.server.MinecraftServer; +import org.bukkit.Bukkit; +import org.bukkit.command.Command; +import org.bukkit.command.SimpleCommandMap; @@ -126,13 +131,10 @@ index 0000000..629224d + + version = getInt( "config-version", 1 ); + readConfig( SpigotConfig.class, null ); -+ } + -+ public static void registerCommands(SimpleCommandMap commandMap) -+ { + for ( Map.Entry entry : commands.entrySet() ) + { -+ commandMap.register( entry.getKey(), "Spigot", entry.getValue() ); ++ MinecraftServer.getServer().server.getCommandMap().register( entry.getKey(), "Spigot", entry.getValue() ); + } + } + diff --git a/CraftBukkit-Patches/0009-Proxy-IP-Filter.patch b/CraftBukkit-Patches/0009-Proxy-IP-Filter.patch index 7988d23c28..fb6130013e 100644 --- a/CraftBukkit-Patches/0009-Proxy-IP-Filter.patch +++ b/CraftBukkit-Patches/0009-Proxy-IP-Filter.patch @@ -1,4 +1,4 @@ -From a26c2eedc264aed6e095e02b5db0e497e7efccee Mon Sep 17 00:00:00 2001 +From d5c30151eab3d605a75a710a29237ffb26adf1f6 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 23 Apr 2013 11:22:07 +1000 Subject: [PATCH] Proxy IP Filter @@ -67,10 +67,10 @@ index 0000000..55d8d12 + } +} diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index 933500d..cbd05af 100644 +index c532dc7..632f86a 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java -@@ -110,4 +110,10 @@ public class SpigotConfig +@@ -108,4 +108,10 @@ public class SpigotConfig config.addDefault( path, def ); return config.getString( path, config.getString( path ) ); } diff --git a/CraftBukkit-Patches/0017-Highly-Optimized-Tick-Loop.patch b/CraftBukkit-Patches/0017-Highly-Optimized-Tick-Loop.patch index 50c15ac46a..9778c0018f 100644 --- a/CraftBukkit-Patches/0017-Highly-Optimized-Tick-Loop.patch +++ b/CraftBukkit-Patches/0017-Highly-Optimized-Tick-Loop.patch @@ -1,4 +1,4 @@ -From 80ac53c4030eb0a997b72702ce1941afa0907af1 Mon Sep 17 00:00:00 2001 +From c6c24ff3f2b9873b4f17444183e5c3eb11516eda Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 3 Feb 2013 12:28:17 +1100 Subject: [PATCH] Highly Optimized Tick Loop @@ -117,10 +117,10 @@ index 0000000..f114a31 + } +} diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index 81f956c..ec613e3 100644 +index 632f86a..5ebb19a 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java -@@ -14,6 +14,7 @@ import org.bukkit.Bukkit; +@@ -15,6 +15,7 @@ import org.bukkit.Bukkit; import org.bukkit.command.Command; import org.bukkit.command.SimpleCommandMap; import org.bukkit.configuration.file.YamlConfiguration; @@ -128,7 +128,7 @@ index 81f956c..ec613e3 100644 public class SpigotConfig { -@@ -116,4 +117,9 @@ public class SpigotConfig +@@ -114,4 +115,9 @@ public class SpigotConfig { preventProxies = getBoolean( "settings.prevent-proxies", false ); } diff --git a/CraftBukkit-Patches/0023-Metrics.patch b/CraftBukkit-Patches/0023-Metrics.patch index 5f916c2d5a..92dbaedac5 100644 --- a/CraftBukkit-Patches/0023-Metrics.patch +++ b/CraftBukkit-Patches/0023-Metrics.patch @@ -1,4 +1,4 @@ -From 0bc162abd73017c3eb6941612ef4e2669dcf65c5 Mon Sep 17 00:00:00 2001 +From 6df166564cdcd609c552fe0b217d9671e10be660 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 23 Feb 2013 08:58:35 +1100 Subject: [PATCH] Metrics @@ -657,10 +657,10 @@ index 0000000..f1690a2 +} \ No newline at end of file diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index 3bd93ad..7825cfc 100644 +index 5ebb19a..9459195 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java -@@ -36,6 +36,7 @@ public class SpigotConfig +@@ -37,6 +37,7 @@ public class SpigotConfig static int version; static Map commands; /*========================================================================*/ @@ -668,10 +668,10 @@ index 3bd93ad..7825cfc 100644 public static void init() { -@@ -47,6 +48,18 @@ public class SpigotConfig - - version = getInt( "config-version", 1 ); - readConfig( SpigotConfig.class, null ); +@@ -53,6 +54,18 @@ public class SpigotConfig + { + MinecraftServer.getServer().server.getCommandMap().register( entry.getKey(), "Spigot", entry.getValue() ); + } + + if ( metrics == null ) + { @@ -686,7 +686,7 @@ index 3bd93ad..7825cfc 100644 + } } - public static void registerCommands(SimpleCommandMap commandMap) + static void readConfig(Class clazz, Object instance) -- 1.8.1.2 diff --git a/CraftBukkit-Patches/0024-Watchdog-Thread.patch b/CraftBukkit-Patches/0024-Watchdog-Thread.patch index b90bafbeda..c27907b262 100644 --- a/CraftBukkit-Patches/0024-Watchdog-Thread.patch +++ b/CraftBukkit-Patches/0024-Watchdog-Thread.patch @@ -1,4 +1,4 @@ -From 6b299bce7cd7b47541e5c780e09555b8e2fed3ff Mon Sep 17 00:00:00 2001 +From 816df7314c4e568cef2591dfbb22ff3af869c4cb Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 23 Feb 2013 12:33:20 +1100 Subject: [PATCH] Watchdog Thread. @@ -142,10 +142,10 @@ index 0000000..a5c4549 + } +} diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index 7825cfc..af567ac 100644 +index 9459195..d8167f2 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java -@@ -135,4 +135,16 @@ public class SpigotConfig +@@ -133,4 +133,16 @@ public class SpigotConfig { commands.put( "tps", new TicksPerSecondCommand( "tps" ) ); } diff --git a/CraftBukkit-Patches/0025-Netty.patch b/CraftBukkit-Patches/0025-Netty.patch index 921fe90f31..249949d133 100644 --- a/CraftBukkit-Patches/0025-Netty.patch +++ b/CraftBukkit-Patches/0025-Netty.patch @@ -1,4 +1,4 @@ -From 2a77e3a6d1b400f134c1a2dec60cc503be2b9332 Mon Sep 17 00:00:00 2001 +From 4656aab62face984022317b27962aa188daa25dd Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 21 Jun 2013 18:23:00 +1000 Subject: [PATCH] Netty @@ -26,10 +26,10 @@ index 8c9f66b..a33020e 100644 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index 6668b7e..b2a4229 100644 +index 2d638c0..7675076 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java -@@ -96,7 +96,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer +@@ -99,7 +99,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer this.getLogger().info("Starting Minecraft server on " + (this.getServerIp().length() == 0 ? "*" : this.getServerIp()) + ":" + this.G()); try { @@ -183,10 +183,10 @@ index 17cfacc..a945892 100644 this.b = true; } catch (Exception exception) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 92c6c88..796085d 100644 +index 24f1f39..07bcb29 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1369,4 +1369,20 @@ public final class CraftServer implements Server { +@@ -1367,4 +1367,20 @@ public final class CraftServer implements Server { public CraftScoreboardManager getScoreboardManager() { return scoreboardManager; } @@ -350,7 +350,7 @@ index 0000000..386c2f8 + } +} diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index 378739e..263cb82 100644 +index d8167f2..9b74bf0 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; @@ -362,7 +362,7 @@ index 378739e..263cb82 100644 import java.util.HashMap; import java.util.List; import java.util.Map; -@@ -147,4 +149,44 @@ public class SpigotConfig +@@ -145,4 +147,44 @@ public class SpigotConfig commands.put( "restart", new RestartCommand( "restart" ) ); WatchdogThread.doStart( timeoutTime, restartOnCrash ); } diff --git a/CraftBukkit-Patches/0030-BungeeCord-Support.patch b/CraftBukkit-Patches/0030-BungeeCord-Support.patch index 84a926b75b..ab603ce2aa 100644 --- a/CraftBukkit-Patches/0030-BungeeCord-Support.patch +++ b/CraftBukkit-Patches/0030-BungeeCord-Support.patch @@ -1,4 +1,4 @@ -From acf178a300ecdb3581ae80151abb9bcc7c396f5d Mon Sep 17 00:00:00 2001 +From 8e61227e44fdc81f2c39ef5463a1013718175998 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 23 Mar 2013 11:15:11 +1100 Subject: [PATCH] BungeeCord Support @@ -75,7 +75,7 @@ index 7cae665..21141f2 100644 public Spigot spigot() diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index 263cb82..14a980b 100644 +index 9b74bf0..8150dd3 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 263cb82..14a980b 100644 import java.util.Collections; import java.util.HashMap; import java.util.List; -@@ -189,4 +190,14 @@ public class SpigotConfig +@@ -187,4 +188,14 @@ public class SpigotConfig listeners.add( new Listener( host, port, netty, connectionThrottle ) ); } } diff --git a/CraftBukkit-Patches/0035-Close-Unloaded-Save-Files.patch b/CraftBukkit-Patches/0035-Close-Unloaded-Save-Files.patch index 8dc2b40479..6233586d6a 100644 --- a/CraftBukkit-Patches/0035-Close-Unloaded-Save-Files.patch +++ b/CraftBukkit-Patches/0035-Close-Unloaded-Save-Files.patch @@ -1,4 +1,4 @@ -From f812ee46c14a5b41054d533ee5727427e75d9a93 Mon Sep 17 00:00:00 2001 +From aefb985765b649229b3fd02cf32a44398bc69465 Mon Sep 17 00:00:00 2001 From: Antony Riley Date: Wed, 27 Mar 2013 01:41:54 +0200 Subject: [PATCH] Close Unloaded Save Files @@ -18,7 +18,7 @@ index 900ed68..829f4a3 100644 public static synchronized RegionFile a(File file1, int i, int j) { File file2 = new File(file1, "region"); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 796085d..8746776 100644 +index 07bcb29..c5a8068 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -37,6 +37,8 @@ import net.minecraft.server.MinecraftServer; @@ -30,7 +30,7 @@ index 796085d..8746776 100644 import net.minecraft.server.ServerNBTManager; import net.minecraft.server.WorldLoaderServer; import net.minecraft.server.WorldManager; -@@ -811,6 +813,30 @@ public final class CraftServer implements Server { +@@ -809,6 +811,30 @@ public final class CraftServer implements Server { worlds.remove(world.getName().toLowerCase()); console.worlds.remove(console.worlds.indexOf(handle)); diff --git a/CraftBukkit-Patches/0048-Do-Not-Search-for-Offline-Players.patch b/CraftBukkit-Patches/0048-Do-Not-Search-for-Offline-Players.patch index e1e672cefc..412112e095 100644 --- a/CraftBukkit-Patches/0048-Do-Not-Search-for-Offline-Players.patch +++ b/CraftBukkit-Patches/0048-Do-Not-Search-for-Offline-Players.patch @@ -1,4 +1,4 @@ -From 834d61d921f90d20f1d92e7ae5768b2c089996df Mon Sep 17 00:00:00 2001 +From 14ab621466bc84c046515970a2f5cfcac7b10f54 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 16 Jun 2013 08:20:26 +1000 Subject: [PATCH] Do Not Search for Offline Players @@ -6,10 +6,10 @@ Subject: [PATCH] Do Not Search for Offline Players By default we do not want to search as this leads to massive load times for plugins wanting to do mass data lookups. diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 8746776..be832ac 100644 +index c5a8068..7534188 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1088,7 +1088,7 @@ public final class CraftServer implements Server { +@@ -1086,7 +1086,7 @@ public final class CraftServer implements Server { } public OfflinePlayer getOfflinePlayer(String name) { diff --git a/CraftBukkit-Patches/0050-Spam-Filter-Exclusions.patch b/CraftBukkit-Patches/0050-Spam-Filter-Exclusions.patch index e379d205f7..718ba1acb4 100644 --- a/CraftBukkit-Patches/0050-Spam-Filter-Exclusions.patch +++ b/CraftBukkit-Patches/0050-Spam-Filter-Exclusions.patch @@ -1,4 +1,4 @@ -From f87070d3aa96a4d3812eeb10695419ec67bf5c37 Mon Sep 17 00:00:00 2001 +From 3ffbaeae0fd56278f77e8a8efdb9afc43588dcbd Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 21 Jun 2013 17:59:22 +1000 Subject: [PATCH] Spam Filter Exclusions @@ -19,10 +19,10 @@ index 998ac8d..a292c1a 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 14a980b..dd02e84 100644 +index 8150dd3..97e99aa 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java -@@ -200,4 +200,13 @@ public class SpigotConfig +@@ -198,4 +198,13 @@ public class SpigotConfig bungeeAddresses = getList( "settings.bungeecord-addresses", bungee ); bungee = getBoolean( "settings.bungeecord", true ); } diff --git a/CraftBukkit-Patches/0051-Allow-Disabling-of-Command-Logging.patch b/CraftBukkit-Patches/0051-Allow-Disabling-of-Command-Logging.patch index 095d02fd6b..1136a900d9 100644 --- a/CraftBukkit-Patches/0051-Allow-Disabling-of-Command-Logging.patch +++ b/CraftBukkit-Patches/0051-Allow-Disabling-of-Command-Logging.patch @@ -1,4 +1,4 @@ -From 6d83cb6ede33f1f2b0e9765270f790bb747f5cd2 Mon Sep 17 00:00:00 2001 +From 13bb5c1c6f2533b7135286e1f3db3b3c6aa31bb5 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 a292c1a..0e8d292 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 dd02e84..b3875c1 100644 +index 97e99aa..69695d2 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java -@@ -209,4 +209,10 @@ public class SpigotConfig +@@ -207,4 +207,10 @@ public class SpigotConfig "/skill" } ) ); } diff --git a/CraftBukkit-Patches/0052-Allow-Disabling-of-Command-TabComplete.patch b/CraftBukkit-Patches/0052-Allow-Disabling-of-Command-TabComplete.patch index 25db3146b4..9a897e79b9 100644 --- a/CraftBukkit-Patches/0052-Allow-Disabling-of-Command-TabComplete.patch +++ b/CraftBukkit-Patches/0052-Allow-Disabling-of-Command-TabComplete.patch @@ -1,14 +1,14 @@ -From 88294560138502bb818d2678ce19888bae1d2d8b Mon Sep 17 00:00:00 2001 +From f68dba495b59be99c881bc4085a0cf6530596ff0 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 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index be832ac..3fa8dbe 100644 +index 7534188..4d030b0 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1355,7 +1355,7 @@ public final class CraftServer implements Server { +@@ -1353,7 +1353,7 @@ public final class CraftServer implements Server { public List tabCompleteCommand(Player player, String message) { List completions = null; try { @@ -18,10 +18,10 @@ index be832ac..3fa8dbe 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 b3875c1..453d0a1 100644 +index 69695d2..d07701e 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java -@@ -215,4 +215,10 @@ public class SpigotConfig +@@ -213,4 +213,10 @@ public class SpigotConfig { logCommands = getBoolean( "commands.log", true ); }