From 391a4159dd33a93397c18509184b45ecdd5683a3 Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 25 Apr 2013 09:01:05 +1000 Subject: [PATCH] Clean up imports in the Spigot class. --- .../0019-Watchdog-Thread.patch | 27 +++++++++++---- .../0030-Entity-Tracking-Ranges.patch | 25 +++++++++++--- .../0031-BungeeCord-Support.patch | 8 ++--- .../0032-Texture-Pack-Resolutions.patch | 8 ++--- ...nt-handshake-spam-from-invalid-names.patch | 34 +++---------------- 5 files changed, 54 insertions(+), 48 deletions(-) diff --git a/CraftBukkit-Patches/0019-Watchdog-Thread.patch b/CraftBukkit-Patches/0019-Watchdog-Thread.patch index e4daa7f776..0cd4f09899 100644 --- a/CraftBukkit-Patches/0019-Watchdog-Thread.patch +++ b/CraftBukkit-Patches/0019-Watchdog-Thread.patch @@ -1,4 +1,4 @@ -From f6790305aeed1bb428e4e666a078fb68482bf3b1 Mon Sep 17 00:00:00 2001 +From e21977783b759a07c1962b262c1b879a5e118e61 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 23 Feb 2013 12:33:20 +1100 Subject: [PATCH] Watchdog Thread. @@ -25,7 +25,7 @@ index 0205822..65a4e9f 100644 this.isStopped = true; } catch (Throwable throwable1) { diff --git a/src/main/java/org/bukkit/craftbukkit/Spigot.java b/src/main/java/org/bukkit/craftbukkit/Spigot.java -index 88c2383..ea2b688 100644 +index 88c2383..c8d1110 100644 --- a/src/main/java/org/bukkit/craftbukkit/Spigot.java +++ b/src/main/java/org/bukkit/craftbukkit/Spigot.java @@ -1,5 +1,6 @@ @@ -35,7 +35,22 @@ index 88c2383..ea2b688 100644 import java.io.IOException; import java.net.InetAddress; import java.util.ArrayList; -@@ -35,6 +36,8 @@ import org.bukkit.Bukkit; +@@ -21,6 +22,7 @@ import net.minecraft.server.EntityHuman; + import net.minecraft.server.EntityItemFrame; + import net.minecraft.server.EntityLiving; + import net.minecraft.server.EntityMonster; ++import net.minecraft.server.EntityPlayer; + import net.minecraft.server.EntityProjectile; + import net.minecraft.server.EntitySheep; + import net.minecraft.server.EntitySlime; +@@ -29,12 +31,15 @@ import net.minecraft.server.EntityWeather; + import net.minecraft.server.EntityWither; + import net.minecraft.server.MathHelper; + import net.minecraft.server.MinecraftServer; ++import net.minecraft.server.Packet255KickDisconnect; + import net.minecraft.server.PendingConnection; + import net.minecraft.server.World; + import org.bukkit.Bukkit; import org.bukkit.command.SimpleCommandMap; import org.bukkit.configuration.file.YamlConfiguration; import org.spigotmc.Metrics; @@ -44,7 +59,7 @@ index 88c2383..ea2b688 100644 public class Spigot { -@@ -48,6 +51,7 @@ public class Spigot { +@@ -48,6 +53,7 @@ public class Spigot { public static void initialize(CraftServer server, SimpleCommandMap commandMap, YamlConfiguration configuration) { commandMap.register("bukkit", new org.bukkit.craftbukkit.command.TicksPerSecondCommand("tps")); @@ -52,7 +67,7 @@ index 88c2383..ea2b688 100644 server.whitelistMessage = configuration.getString("settings.whitelist-message", server.whitelistMessage); server.stopMessage = configuration.getString("settings.stop-message", server.stopMessage); -@@ -56,6 +60,17 @@ public class Spigot { +@@ -56,6 +62,17 @@ public class Spigot { server.spamGuardExclusions = configuration.getStringList("settings.spam-exclusions"); filterIps = configuration.getBoolean("settings.filter-unsafe-ips", false); @@ -70,7 +85,7 @@ index 88c2383..ea2b688 100644 server.orebfuscatorEnabled = configuration.getBoolean("orebfuscator.enable", false); server.orebfuscatorEngineMode = configuration.getInt("orebfuscator.engine-mode", 1); server.orebfuscatorUpdateRadius = configuration.getInt("orebfuscator.update-radius", 2); -@@ -296,6 +311,66 @@ public class Spigot { +@@ -296,6 +313,66 @@ public class Spigot { return isActive; } diff --git a/CraftBukkit-Patches/0030-Entity-Tracking-Ranges.patch b/CraftBukkit-Patches/0030-Entity-Tracking-Ranges.patch index 928368101f..15674ef2d8 100644 --- a/CraftBukkit-Patches/0030-Entity-Tracking-Ranges.patch +++ b/CraftBukkit-Patches/0030-Entity-Tracking-Ranges.patch @@ -1,4 +1,4 @@ -From e8ddf21f0ec35ca6e4ffc6bd8e298fffc7203462 Mon Sep 17 00:00:00 2001 +From fa94cec348e0cfc5b654ccde91839f80bd52f3f2 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 20 Feb 2013 11:58:47 -0500 Subject: [PATCH] Entity Tracking Ranges @@ -24,7 +24,7 @@ index d7efe3e..f6f1ab0 100644 i = this.d; } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 6a0f02c..cfd7fee 100644 +index 94cb855..fe7b8b0 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -107,6 +107,12 @@ public class CraftWorld implements World { @@ -78,10 +78,27 @@ index 6a0f02c..cfd7fee 100644 public Block getBlockAt(int x, int y, int z) { diff --git a/src/main/java/org/bukkit/craftbukkit/Spigot.java b/src/main/java/org/bukkit/craftbukkit/Spigot.java -index ea2b688..435358f 100644 +index c8d1110..1117309 100644 --- a/src/main/java/org/bukkit/craftbukkit/Spigot.java +++ b/src/main/java/org/bukkit/craftbukkit/Spigot.java -@@ -371,6 +371,32 @@ public class Spigot { +@@ -16,12 +16,16 @@ import net.minecraft.server.EntityComplexPart; + import net.minecraft.server.EntityCreature; + import net.minecraft.server.EntityEnderCrystal; + import net.minecraft.server.EntityEnderDragon; ++import net.minecraft.server.EntityExperienceOrb; + import net.minecraft.server.EntityFireball; + import net.minecraft.server.EntityFireworks; ++import net.minecraft.server.EntityGhast; + import net.minecraft.server.EntityHuman; ++import net.minecraft.server.EntityItem; + import net.minecraft.server.EntityItemFrame; + import net.minecraft.server.EntityLiving; + import net.minecraft.server.EntityMonster; ++import net.minecraft.server.EntityPainting; + import net.minecraft.server.EntityPlayer; + import net.minecraft.server.EntityProjectile; + import net.minecraft.server.EntitySheep; +@@ -373,6 +377,32 @@ public class Spigot { } } diff --git a/CraftBukkit-Patches/0031-BungeeCord-Support.patch b/CraftBukkit-Patches/0031-BungeeCord-Support.patch index 5cbe2ce69f..f167255a6d 100644 --- a/CraftBukkit-Patches/0031-BungeeCord-Support.patch +++ b/CraftBukkit-Patches/0031-BungeeCord-Support.patch @@ -1,4 +1,4 @@ -From 4b167babf36a1df279095cae6a3a0f2ba4f63831 Mon Sep 17 00:00:00 2001 +From 8a0aa7988493790f42d53a0e6f6fea2574e9007f Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 23 Mar 2013 11:15:11 +1100 Subject: [PATCH] BungeeCord Support @@ -28,10 +28,10 @@ index 836ad94..72fb172 100644 + // Spigot end } diff --git a/src/main/java/org/bukkit/craftbukkit/Spigot.java b/src/main/java/org/bukkit/craftbukkit/Spigot.java -index 435358f..e7917a3 100644 +index 1117309..015976b 100644 --- a/src/main/java/org/bukkit/craftbukkit/Spigot.java +++ b/src/main/java/org/bukkit/craftbukkit/Spigot.java -@@ -48,6 +48,7 @@ public class Spigot { +@@ -54,6 +54,7 @@ public class Spigot { private static boolean filterIps; public static boolean tabPing = false; private static Metrics metrics; @@ -39,7 +39,7 @@ index 435358f..e7917a3 100644 public static void initialize(CraftServer server, SimpleCommandMap commandMap, YamlConfiguration configuration) { commandMap.register("bukkit", new org.bukkit.craftbukkit.command.TicksPerSecondCommand("tps")); -@@ -85,6 +86,7 @@ public class Spigot { +@@ -91,6 +92,7 @@ public class Spigot { } tabPing = configuration.getBoolean("settings.tab-ping", tabPing); diff --git a/CraftBukkit-Patches/0032-Texture-Pack-Resolutions.patch b/CraftBukkit-Patches/0032-Texture-Pack-Resolutions.patch index 8182b6f37b..fe32bd6d10 100644 --- a/CraftBukkit-Patches/0032-Texture-Pack-Resolutions.patch +++ b/CraftBukkit-Patches/0032-Texture-Pack-Resolutions.patch @@ -1,4 +1,4 @@ -From 02d1a854b541633f659b9683c3e23a947c8c43f5 Mon Sep 17 00:00:00 2001 +From 8f06bcb14829489d0baa8169f74c4a7c0edeea05 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 23 Mar 2013 13:04:45 +1100 Subject: [PATCH] Texture Pack Resolutions @@ -19,10 +19,10 @@ index 65a4e9f..a1d77ad 100644 public abstract boolean T(); diff --git a/src/main/java/org/bukkit/craftbukkit/Spigot.java b/src/main/java/org/bukkit/craftbukkit/Spigot.java -index e7917a3..490553b 100644 +index 015976b..fa0b268 100644 --- a/src/main/java/org/bukkit/craftbukkit/Spigot.java +++ b/src/main/java/org/bukkit/craftbukkit/Spigot.java -@@ -49,6 +49,7 @@ public class Spigot { +@@ -55,6 +55,7 @@ public class Spigot { public static boolean tabPing = false; private static Metrics metrics; public static List bungeeIPs; @@ -30,7 +30,7 @@ index e7917a3..490553b 100644 public static void initialize(CraftServer server, SimpleCommandMap commandMap, YamlConfiguration configuration) { commandMap.register("bukkit", new org.bukkit.craftbukkit.command.TicksPerSecondCommand("tps")); -@@ -87,6 +88,7 @@ public class Spigot { +@@ -93,6 +94,7 @@ public class Spigot { tabPing = configuration.getBoolean("settings.tab-ping", tabPing); bungeeIPs = configuration.getStringList("settings.bungee-proxies"); diff --git a/CraftBukkit-Patches/0037-Prevent-handshake-spam-from-invalid-names.patch b/CraftBukkit-Patches/0037-Prevent-handshake-spam-from-invalid-names.patch index 7d17a44522..610a38a24d 100644 --- a/CraftBukkit-Patches/0037-Prevent-handshake-spam-from-invalid-names.patch +++ b/CraftBukkit-Patches/0037-Prevent-handshake-spam-from-invalid-names.patch @@ -1,4 +1,4 @@ -From eba3ae1b89ac9d2387bf6cc2be735a2f30806ee1 Mon Sep 17 00:00:00 2001 +From 69c0a45a175c50a7d1dc812c4c0b978a9ba26307 Mon Sep 17 00:00:00 2001 From: Benjamin James Harrison-Sims Date: Sun, 14 Apr 2013 21:19:57 +0500 Subject: [PATCH] Prevent handshake spam from invalid names. @@ -25,7 +25,7 @@ index 343af93..aa6609b 100644 public void a(DataOutputStream dataoutputstream) throws IOException { // CraftBukkit - throws IOException diff --git a/src/main/java/org/bukkit/craftbukkit/Spigot.java b/src/main/java/org/bukkit/craftbukkit/Spigot.java -index 490553b..1f61d23 100644 +index fa0b268..1f61d23 100644 --- a/src/main/java/org/bukkit/craftbukkit/Spigot.java +++ b/src/main/java/org/bukkit/craftbukkit/Spigot.java @@ -6,6 +6,7 @@ import java.net.InetAddress; @@ -36,33 +36,7 @@ index 490553b..1f61d23 100644 import net.minecraft.server.AxisAlignedBB; import net.minecraft.server.Chunk; import net.minecraft.server.Entity; -@@ -16,12 +17,17 @@ import net.minecraft.server.EntityComplexPart; - import net.minecraft.server.EntityCreature; - import net.minecraft.server.EntityEnderCrystal; - import net.minecraft.server.EntityEnderDragon; -+import net.minecraft.server.EntityExperienceOrb; - import net.minecraft.server.EntityFireball; - import net.minecraft.server.EntityFireworks; -+import net.minecraft.server.EntityGhast; - import net.minecraft.server.EntityHuman; -+import net.minecraft.server.EntityItem; - import net.minecraft.server.EntityItemFrame; - import net.minecraft.server.EntityLiving; - import net.minecraft.server.EntityMonster; -+import net.minecraft.server.EntityPainting; -+import net.minecraft.server.EntityPlayer; - import net.minecraft.server.EntityProjectile; - import net.minecraft.server.EntitySheep; - import net.minecraft.server.EntitySlime; -@@ -30,6 +36,7 @@ import net.minecraft.server.EntityWeather; - import net.minecraft.server.EntityWither; - import net.minecraft.server.MathHelper; - import net.minecraft.server.MinecraftServer; -+import net.minecraft.server.Packet255KickDisconnect; - import net.minecraft.server.PendingConnection; - import net.minecraft.server.World; - import org.bukkit.Bukkit; -@@ -50,6 +57,7 @@ public class Spigot { +@@ -56,6 +57,7 @@ public class Spigot { private static Metrics metrics; public static List bungeeIPs; public static int textureResolution = 16; @@ -70,7 +44,7 @@ index 490553b..1f61d23 100644 public static void initialize(CraftServer server, SimpleCommandMap commandMap, YamlConfiguration configuration) { commandMap.register("bukkit", new org.bukkit.craftbukkit.command.TicksPerSecondCommand("tps")); -@@ -376,7 +384,9 @@ public class Spigot { +@@ -382,7 +384,9 @@ public class Spigot { } /**