From 2a4600c6f08deda8680ac42d30354cc18e23f65f Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 16 May 2013 18:10:23 +1000 Subject: [PATCH] Implement changes to orebfuscator, including remove update radius configuration and update on player interact --- ...r-Spigot.patch => 0015-Orebfuscator.patch} | 75 +++++++++---------- .../0018-Entity-Activation-Range.patch | 8 +- ...-the-Metrics-system-to-be-closer-to-.patch | 6 +- .../0020-Watchdog-Thread.patch | 10 +-- CraftBukkit-Patches/0021-Netty.patch | 12 +-- .../0030-Entity-Tracking-Ranges.patch | 8 +- .../0031-BungeeCord-Support.patch | 8 +- .../0032-Texture-Pack-Resolutions.patch | 10 +-- ...nt-handshake-spam-from-invalid-names.patch | 6 +- ...3-Close-world-save-files-when-world-.patch | 6 +- 10 files changed, 73 insertions(+), 76 deletions(-) rename CraftBukkit-Patches/{0015-Add-oreobfuscator-for-Spigot.patch => 0015-Orebfuscator.patch} (89%) diff --git a/CraftBukkit-Patches/0015-Add-oreobfuscator-for-Spigot.patch b/CraftBukkit-Patches/0015-Orebfuscator.patch similarity index 89% rename from CraftBukkit-Patches/0015-Add-oreobfuscator-for-Spigot.patch rename to CraftBukkit-Patches/0015-Orebfuscator.patch index 014cf457b0..5e69111047 100644 --- a/CraftBukkit-Patches/0015-Add-oreobfuscator-for-Spigot.patch +++ b/CraftBukkit-Patches/0015-Orebfuscator.patch @@ -1,8 +1,9 @@ -From 06974f3e2abe579c6790c1e22b17ec6c444e2361 Mon Sep 17 00:00:00 2001 +From ce7c0ac39044dfe8ad145cb765c21ef9a855bb44 Mon Sep 17 00:00:00 2001 From: md_5 -Date: Sat, 23 Mar 2013 10:58:17 +1100 -Subject: [PATCH] Add oreobfuscator for Spigot. +Date: Thu, 16 May 2013 18:09:28 +1000 +Subject: [PATCH] Orebfuscator +Implement lightweight orebfuscator to Spigot diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java index 17d837d..ecc52b9 100644 @@ -41,7 +42,7 @@ index d11c0ea..6967b74 100644 try { this.inflatedBuffer = chunkmap.a; diff --git a/src/main/java/net/minecraft/server/Packet56MapChunkBulk.java b/src/main/java/net/minecraft/server/Packet56MapChunkBulk.java -index 129dc4f..9f8afe3 100644 +index 129dc4f..b7ffab5 100644 --- a/src/main/java/net/minecraft/server/Packet56MapChunkBulk.java +++ b/src/main/java/net/minecraft/server/Packet56MapChunkBulk.java @@ -28,6 +28,7 @@ public class Packet56MapChunkBulk extends Packet { @@ -52,17 +53,16 @@ index 129dc4f..9f8afe3 100644 public Packet56MapChunkBulk() {} -@@ -46,6 +47,9 @@ public class Packet56MapChunkBulk extends Packet { +@@ -46,6 +47,8 @@ public class Packet56MapChunkBulk extends Packet { Chunk chunk = (Chunk) list.get(k); ChunkMap chunkmap = Packet51MapChunk.a(chunk, true, '\uffff'); + world = chunk.world; // Spigot (Orebfuscator) + /* Spigot (Orebfuscator) - Don't use the build buffer yet. Copy to it more efficiently once the chunk is obfuscated -+ // Moved to compress() if (buildBuffer.length < j + chunkmap.a.length) { byte[] abyte = new byte[j + chunkmap.a.length]; -@@ -53,7 +57,7 @@ public class Packet56MapChunkBulk extends Packet { +@@ -53,7 +56,7 @@ public class Packet56MapChunkBulk extends Packet { buildBuffer = abyte; } @@ -71,7 +71,7 @@ index 129dc4f..9f8afe3 100644 j += chunkmap.a.length; this.c[k] = chunk.x; this.d[k] = chunk.z; -@@ -82,6 +86,21 @@ public class Packet56MapChunkBulk extends Packet { +@@ -82,6 +85,21 @@ public class Packet56MapChunkBulk extends Packet { return; } @@ -94,33 +94,28 @@ index 129dc4f..9f8afe3 100644 deflater.reset(); deflater.setInput(this.buildBuffer); diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java -index 1243d1d..1a31112 100644 +index 1243d1d..e45bcd2 100644 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java -@@ -285,6 +285,11 @@ public class PlayerInteractManager { +@@ -184,6 +184,7 @@ public class PlayerInteractManager { + this.o = j1; } - return false; } -+ // Spigot (Orebfuscator) start -+ else { -+ org.spigotmc.OrebfuscatorManager.updateNearbyBlocks(world, i, j, k); -+ } -+ // Spigot (Orebfuscator) end ++ org.spigotmc.OrebfuscatorManager.updateNearbyBlocks(world, i, j, k); // Spigot } + } - if (false) { // Never trigger diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 12c5f81..767f3c3 100644 +index 12c5f81..010e9c3 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -163,6 +163,13 @@ public final class CraftServer implements Server { +@@ -163,6 +163,12 @@ public final class CraftServer implements Server { private final BooleanWrapper online = new BooleanWrapper(); public CraftScoreboardManager scoreboardManager; + // Orebfuscator use + public boolean orebfuscatorEnabled = false; + public int orebfuscatorEngineMode = 1; -+ public int orebfuscatorUpdateRadius = 2; + public List orebfuscatorDisabledWorlds; + public List orebfuscatorBlocks; + @@ -157,16 +152,15 @@ index 44d1842..7d05a77 100644 public int wheatGrowthModifier = 100; public int cactusGrowthModifier = 100; diff --git a/src/main/java/org/bukkit/craftbukkit/Spigot.java b/src/main/java/org/bukkit/craftbukkit/Spigot.java -index 67477f4..c4eea4d 100644 +index 67477f4..e5004b3 100644 --- a/src/main/java/org/bukkit/craftbukkit/Spigot.java +++ b/src/main/java/org/bukkit/craftbukkit/Spigot.java -@@ -19,6 +19,15 @@ public class Spigot { +@@ -19,6 +19,14 @@ public class Spigot { server.spamGuardExclusions = configuration.getStringList("settings.spam-exclusions"); filterIps = configuration.getBoolean("settings.filter-unsafe-ips", false); + server.orebfuscatorEnabled = configuration.getBoolean("orebfuscator.enable", false); + server.orebfuscatorEngineMode = configuration.getInt("orebfuscator.engine-mode", 1); -+ server.orebfuscatorUpdateRadius = configuration.getInt("orebfuscator.update-radius", 2); + server.orebfuscatorDisabledWorlds = configuration.getStringList("orebfuscator.disabled-worlds"); + server.orebfuscatorBlocks = configuration.getShortList("orebfuscator.blocks"); + if (server.orebfuscatorEngineMode != 1 && server.orebfuscatorEngineMode != 2) { @@ -178,10 +172,10 @@ index 67477f4..c4eea4d 100644 } diff --git a/src/main/java/org/spigotmc/OrebfuscatorManager.java b/src/main/java/org/spigotmc/OrebfuscatorManager.java new file mode 100644 -index 0000000..f1eee2b +index 0000000..b1075f1 --- /dev/null +++ b/src/main/java/org/spigotmc/OrebfuscatorManager.java -@@ -0,0 +1,139 @@ +@@ -0,0 +1,143 @@ +package org.spigotmc; + +import java.util.ArrayList; @@ -195,10 +189,9 @@ index 0000000..f1eee2b + + // Used to keep track of which blocks to obfuscate + private static final boolean[] obfuscateBlocks = new boolean[Short.MAX_VALUE]; -+ private static Byte[] ores; ++ private static byte[] ores; + private static final CustomTimingsHandler obfuscate = new CustomTimingsHandler("xray - obfuscate"); + private static final CustomTimingsHandler update = new CustomTimingsHandler("xray - update"); -+ private static int ITERATOR = 0; + + // Default blocks + static { @@ -209,17 +202,21 @@ index 0000000..f1eee2b + List blocks = new ArrayList(); + for (int i = 0; i < obfuscateBlocks.length; i++) { + if (obfuscateBlocks[i]) { -+ if (i != Block.STONE.id && i != Block.CHEST.id && i != Block.ENDER_CHEST.id) { ++ Block block = Block.byId[i]; ++ if (i != Block.STONE.id && block != null && !block.t() /* isTileEntity */) { + blocks.add((byte) i); + } + } + } -+ ores = blocks.toArray(new Byte[blocks.size()]); ++ ores = new byte[blocks.size()]; ++ for (int i = 0; i < ores.length; i++) { ++ ores[i] = blocks.get(i); ++ } + } + + public static void updateNearbyBlocks(World world, int x, int y, int z) { + update.startTiming(); -+ updateNearbyBlocks(world, x, y, z, world.getServer().orebfuscatorUpdateRadius); ++ updateNearbyBlocks(world, x, y, z, 2); + update.stopTiming(); + } + @@ -230,11 +227,12 @@ index 0000000..f1eee2b + } + + public static void obfuscate(int chunkX, int chunkY, int bitmask, byte[] buffer, World world) { -+ if (world.getServer().orebfuscatorEnabled && world.getWorld().obfuscated) { ++ if (world.getWorld().obfuscated) { + int initialRadius = 1; + int index = 0; + int startX = chunkX << 4; + int startZ = chunkY << 4; ++ int iterator = 0; + for (int i = 0; i < 16; i++) { + // If the bitmask indicates this chunk is sent... + if ((bitmask & 1 << i) != 0) { @@ -250,10 +248,10 @@ index 0000000..f1eee2b + if (initialRadius == 0 || !areAjacentBlocksTransparent(world, startX + x, (i << 4) + y, startZ + z, initialRadius)) { + if (world.getServer().orebfuscatorEngineMode == 2) { + // Replace with random ore. -+ if (ITERATOR >= ores.length) { -+ ITERATOR = 0; ++ if (iterator >= ores.length) { ++ iterator = 0; + } -+ buffer[index] = (byte) (int) ores[ITERATOR++]; ++ buffer[index] = (byte) (int) ores[iterator++]; + } else { + if (world.getServer().orebfuscatorEngineMode == 1) { + // Replace with stone @@ -295,7 +293,7 @@ index 0000000..f1eee2b + } + } + } -+ ++ + private static boolean isWorldLoaded(World world, int x, int y, int z, int radius) { + boolean toret = (y > 0 && y <= world.getHeight() && world.isLoaded(x, y, z)); + if (toret) { @@ -306,7 +304,7 @@ index 0000000..f1eee2b + || isWorldLoaded(world, x, y, z + 1, radius - 1) + || isWorldLoaded(world, x, y, z - 1, radius - 1))); + } -+ ++ + return false; + } + @@ -322,17 +320,16 @@ index 0000000..f1eee2b + } +} diff --git a/src/main/resources/configurations/bukkit.yml b/src/main/resources/configurations/bukkit.yml -index 10ef7f2..9f6c57d 100644 +index 10ef7f2..e08325d 100644 --- a/src/main/resources/configurations/bukkit.yml +++ b/src/main/resources/configurations/bukkit.yml -@@ -82,3 +82,10 @@ database: +@@ -82,3 +82,9 @@ database: driver: org.sqlite.JDBC password: walrus url: jdbc:sqlite:{DIR}{NAME}.db +orebfuscator: + enable: false + engine-mode: 1 -+ update-radius: 2 + disabled-worlds: + - world_the_end + blocks: [1, 5, 14, 15, 16, 21, 48, 49, 54, 56, 73, 74, 82, 129, 130] diff --git a/CraftBukkit-Patches/0018-Entity-Activation-Range.patch b/CraftBukkit-Patches/0018-Entity-Activation-Range.patch index 891d3c6704..ea34b19532 100644 --- a/CraftBukkit-Patches/0018-Entity-Activation-Range.patch +++ b/CraftBukkit-Patches/0018-Entity-Activation-Range.patch @@ -1,4 +1,4 @@ -From 4bc75aa65c4aaa26d5158594602168b2cfd62875 Mon Sep 17 00:00:00 2001 +From 4886c3dc2c666f6726df9643a4ce71d5e8288d24 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 3 Feb 2013 05:10:21 -0500 Subject: [PATCH] Entity Activation Range @@ -148,7 +148,7 @@ index 7d05a77..94cb855 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 c4eea4d..3e4a0a9 100644 +index e5004b3..e89c3a5 100644 --- a/src/main/java/org/bukkit/craftbukkit/Spigot.java +++ b/src/main/java/org/bukkit/craftbukkit/Spigot.java @@ -1,12 +1,43 @@ @@ -195,7 +195,7 @@ index c4eea4d..3e4a0a9 100644 private static boolean filterIps; public static void initialize(CraftServer server, SimpleCommandMap commandMap, YamlConfiguration configuration) { -@@ -25,12 +56,227 @@ public class Spigot { +@@ -24,12 +55,227 @@ public class Spigot { server.orebfuscatorDisabledWorlds = configuration.getStringList("orebfuscator.disabled-worlds"); server.orebfuscatorBlocks = configuration.getShortList("orebfuscator.blocks"); if (server.orebfuscatorEngineMode != 1 && server.orebfuscatorEngineMode != 2) { @@ -439,7 +439,7 @@ index bbb6368..d8f73ad 100644 public static final HashMap tileEntityTypeTimingMap = new HashMap(); public static final HashMap pluginTaskTimingMap = new HashMap(); diff --git a/src/main/resources/configurations/bukkit.yml b/src/main/resources/configurations/bukkit.yml -index 9f6c57d..655ee24 100644 +index e08325d..96d26d4 100644 --- a/src/main/resources/configurations/bukkit.yml +++ b/src/main/resources/configurations/bukkit.yml @@ -46,6 +46,9 @@ world-settings: diff --git a/CraftBukkit-Patches/0019-Metrics.-Rewrite-the-Metrics-system-to-be-closer-to-.patch b/CraftBukkit-Patches/0019-Metrics.-Rewrite-the-Metrics-system-to-be-closer-to-.patch index 08878a69c7..0b3edc0da8 100644 --- a/CraftBukkit-Patches/0019-Metrics.-Rewrite-the-Metrics-system-to-be-closer-to-.patch +++ b/CraftBukkit-Patches/0019-Metrics.-Rewrite-the-Metrics-system-to-be-closer-to-.patch @@ -1,4 +1,4 @@ -From c4c47af95920411ffd43ca773f3aa76b7a797f6b Mon Sep 17 00:00:00 2001 +From 239364226632569bd61bdda0d0f6849fb2df6452 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 23 Feb 2013 08:58:35 +1100 Subject: [PATCH] Metrics. Rewrite the Metrics system to be closer to the @@ -6,7 +6,7 @@ Subject: [PATCH] Metrics. Rewrite the Metrics system to be closer to the diff --git a/src/main/java/org/bukkit/craftbukkit/Spigot.java b/src/main/java/org/bukkit/craftbukkit/Spigot.java -index 3e4a0a9..c81503e 100644 +index e89c3a5..4b222a3 100644 --- a/src/main/java/org/bukkit/craftbukkit/Spigot.java +++ b/src/main/java/org/bukkit/craftbukkit/Spigot.java @@ -1,8 +1,10 @@ @@ -40,7 +40,7 @@ index 3e4a0a9..c81503e 100644 public static void initialize(CraftServer server, SimpleCommandMap commandMap, YamlConfiguration configuration) { commandMap.register("bukkit", new org.bukkit.craftbukkit.command.TicksPerSecondCommand("tps")); -@@ -63,6 +69,16 @@ public class Spigot { +@@ -62,6 +68,16 @@ public class Spigot { server.getLogger().severe("[Spigot] You should not disable chunk-gc, unexpected behaviour may occur!"); } diff --git a/CraftBukkit-Patches/0020-Watchdog-Thread.patch b/CraftBukkit-Patches/0020-Watchdog-Thread.patch index b75ae69ea1..11d9875382 100644 --- a/CraftBukkit-Patches/0020-Watchdog-Thread.patch +++ b/CraftBukkit-Patches/0020-Watchdog-Thread.patch @@ -1,4 +1,4 @@ -From 306989a61052788166338af01c3953558549bc23 Mon Sep 17 00:00:00 2001 +From 0d8044768b64182f10d4b86615c01f509e5eb97c 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 044db9f..d57ed7a 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 c81503e..c2231af 100644 +index 4b222a3..4cbc796 100644 --- a/src/main/java/org/bukkit/craftbukkit/Spigot.java +++ b/src/main/java/org/bukkit/craftbukkit/Spigot.java @@ -1,5 +1,6 @@ @@ -84,8 +84,8 @@ index c81503e..c2231af 100644 + server.orebfuscatorEnabled = configuration.getBoolean("orebfuscator.enable", false); server.orebfuscatorEngineMode = configuration.getInt("orebfuscator.engine-mode", 1); - server.orebfuscatorUpdateRadius = configuration.getInt("orebfuscator.update-radius", 2); -@@ -295,6 +312,66 @@ public class Spigot { + server.orebfuscatorDisabledWorlds = configuration.getStringList("orebfuscator.disabled-worlds"); +@@ -294,6 +311,66 @@ public class Spigot { return isActive; } @@ -281,7 +281,7 @@ index 0000000..10390b8 + } +} diff --git a/src/main/resources/configurations/bukkit.yml b/src/main/resources/configurations/bukkit.yml -index 655ee24..7a6c12f 100644 +index 96d26d4..67b4fa9 100644 --- a/src/main/resources/configurations/bukkit.yml +++ b/src/main/resources/configurations/bukkit.yml @@ -31,6 +31,9 @@ settings: diff --git a/CraftBukkit-Patches/0021-Netty.patch b/CraftBukkit-Patches/0021-Netty.patch index d2f1c7c668..3b43bbcca2 100644 --- a/CraftBukkit-Patches/0021-Netty.patch +++ b/CraftBukkit-Patches/0021-Netty.patch @@ -1,4 +1,4 @@ -From a611df970f7c6f5ef3f2777f66ec528a3c1f2eaa Mon Sep 17 00:00:00 2001 +From a72f87c26a179f0ffab01ca07593c4bdb7a9ff68 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 23 Apr 2013 11:47:32 +1000 Subject: [PATCH] Netty @@ -126,7 +126,7 @@ index 1862863..5a24f2a 100644 + public void setSocketAddress(SocketAddress address) { k = address; } // Spigot } diff --git a/src/main/java/net/minecraft/server/Packet51MapChunk.java b/src/main/java/net/minecraft/server/Packet51MapChunk.java -index 2fcd7f7..11c44dd 100644 +index 6967b74..65bb826 100644 --- a/src/main/java/net/minecraft/server/Packet51MapChunk.java +++ b/src/main/java/net/minecraft/server/Packet51MapChunk.java @@ -42,7 +42,7 @@ public class Packet51MapChunk extends Packet { @@ -139,7 +139,7 @@ index 2fcd7f7..11c44dd 100644 this.d = chunkmap.c; this.c = chunkmap.b; diff --git a/src/main/java/net/minecraft/server/Packet56MapChunkBulk.java b/src/main/java/net/minecraft/server/Packet56MapChunkBulk.java -index 9f8afe3..a89c9c9 100644 +index b7ffab5..3af3eed 100644 --- a/src/main/java/net/minecraft/server/Packet56MapChunkBulk.java +++ b/src/main/java/net/minecraft/server/Packet56MapChunkBulk.java @@ -24,7 +24,7 @@ public class Packet56MapChunkBulk extends Packet { @@ -205,10 +205,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 767f3c3..028e7dd 100644 +index 010e9c3..fc9170f 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1375,4 +1375,20 @@ public final class CraftServer implements Server { +@@ -1374,4 +1374,20 @@ public final class CraftServer implements Server { public CraftScoreboardManager getScoreboardManager() { return scoreboardManager; } @@ -1349,7 +1349,7 @@ index 0000000..5dc3754 + DATA; +} diff --git a/src/main/resources/configurations/bukkit.yml b/src/main/resources/configurations/bukkit.yml -index 7a6c12f..1a57fdd 100644 +index 67b4fa9..d26e644 100644 --- a/src/main/resources/configurations/bukkit.yml +++ b/src/main/resources/configurations/bukkit.yml @@ -13,6 +13,9 @@ diff --git a/CraftBukkit-Patches/0030-Entity-Tracking-Ranges.patch b/CraftBukkit-Patches/0030-Entity-Tracking-Ranges.patch index e20fa2bd68..555e25fe4c 100644 --- a/CraftBukkit-Patches/0030-Entity-Tracking-Ranges.patch +++ b/CraftBukkit-Patches/0030-Entity-Tracking-Ranges.patch @@ -1,4 +1,4 @@ -From ec57dc372930d4f73afd8236067f957b072047c3 Mon Sep 17 00:00:00 2001 +From 9562c98d051c1af7030a149902c5f5326584e84f Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 20 Feb 2013 11:58:47 -0500 Subject: [PATCH] Entity Tracking Ranges @@ -78,7 +78,7 @@ index 94cb855..fe7b8b0 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 c2231af..f25852e 100644 +index 4cbc796..fed3181 100644 --- a/src/main/java/org/bukkit/craftbukkit/Spigot.java +++ b/src/main/java/org/bukkit/craftbukkit/Spigot.java @@ -16,12 +16,16 @@ import net.minecraft.server.EntityComplexPart; @@ -98,7 +98,7 @@ index c2231af..f25852e 100644 import net.minecraft.server.EntityPlayer; import net.minecraft.server.EntityProjectile; import net.minecraft.server.EntitySheep; -@@ -372,6 +376,32 @@ public class Spigot { +@@ -371,6 +375,32 @@ public class Spigot { } } @@ -132,7 +132,7 @@ index c2231af..f25852e 100644 if (filterIps) { try { diff --git a/src/main/resources/configurations/bukkit.yml b/src/main/resources/configurations/bukkit.yml -index 1a57fdd..eb23dae 100644 +index d26e644..71374d7 100644 --- a/src/main/resources/configurations/bukkit.yml +++ b/src/main/resources/configurations/bukkit.yml @@ -55,6 +55,11 @@ world-settings: diff --git a/CraftBukkit-Patches/0031-BungeeCord-Support.patch b/CraftBukkit-Patches/0031-BungeeCord-Support.patch index dbbfcec91f..18123baf96 100644 --- a/CraftBukkit-Patches/0031-BungeeCord-Support.patch +++ b/CraftBukkit-Patches/0031-BungeeCord-Support.patch @@ -1,4 +1,4 @@ -From ee5ca0a66101f023785a213a33eacb5be00b114f Mon Sep 17 00:00:00 2001 +From 7ba79caac4ca9b248fe29b48ef6852db5c19fd13 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 23 Mar 2013 11:15:11 +1100 Subject: [PATCH] BungeeCord Support @@ -59,7 +59,7 @@ index fcd4136..fb4ec7b 100644 event.disallow(asyncEvent.getResult(), asyncEvent.getKickMessage()); } diff --git a/src/main/java/org/bukkit/craftbukkit/Spigot.java b/src/main/java/org/bukkit/craftbukkit/Spigot.java -index f25852e..b327310 100644 +index fed3181..a0c66d8 100644 --- a/src/main/java/org/bukkit/craftbukkit/Spigot.java +++ b/src/main/java/org/bukkit/craftbukkit/Spigot.java @@ -54,6 +54,7 @@ public class Spigot { @@ -70,7 +70,7 @@ index f25852e..b327310 100644 public static void initialize(CraftServer server, SimpleCommandMap commandMap, YamlConfiguration configuration) { commandMap.register("bukkit", new org.bukkit.craftbukkit.command.TicksPerSecondCommand("tps")); -@@ -91,6 +92,7 @@ public class Spigot { +@@ -90,6 +91,7 @@ public class Spigot { } tabPing = configuration.getBoolean("settings.tab-ping", tabPing); @@ -94,7 +94,7 @@ index 0b5ea21..fa9b9f1 100644 + // Spigot end } diff --git a/src/main/resources/configurations/bukkit.yml b/src/main/resources/configurations/bukkit.yml -index eb23dae..62bf79a 100644 +index 71374d7..f0d9129 100644 --- a/src/main/resources/configurations/bukkit.yml +++ b/src/main/resources/configurations/bukkit.yml @@ -37,6 +37,8 @@ settings: diff --git a/CraftBukkit-Patches/0032-Texture-Pack-Resolutions.patch b/CraftBukkit-Patches/0032-Texture-Pack-Resolutions.patch index 227bcd1680..7ad70d836e 100644 --- a/CraftBukkit-Patches/0032-Texture-Pack-Resolutions.patch +++ b/CraftBukkit-Patches/0032-Texture-Pack-Resolutions.patch @@ -1,4 +1,4 @@ -From bdcdd72dc9878325c316a5595fb7d1ef0224aea1 Mon Sep 17 00:00:00 2001 +From 0c415386eb2d5067b50fe09a5db3bfb7288bf7e2 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,7 +19,7 @@ index d57ed7a..6a6181c 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 b327310..b28f745 100644 +index a0c66d8..7fafe01 100644 --- a/src/main/java/org/bukkit/craftbukkit/Spigot.java +++ b/src/main/java/org/bukkit/craftbukkit/Spigot.java @@ -55,6 +55,7 @@ public class Spigot { @@ -30,7 +30,7 @@ index b327310..b28f745 100644 public static void initialize(CraftServer server, SimpleCommandMap commandMap, YamlConfiguration configuration) { commandMap.register("bukkit", new org.bukkit.craftbukkit.command.TicksPerSecondCommand("tps")); -@@ -93,6 +94,7 @@ public class Spigot { +@@ -92,6 +93,7 @@ public class Spigot { tabPing = configuration.getBoolean("settings.tab-ping", tabPing); bungeeIPs = configuration.getStringList("settings.bungee-proxies"); @@ -39,7 +39,7 @@ index b327310..b28f745 100644 if (metrics == null) { try { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 0b5ea21..f959fdf 100644 +index fa9b9f1..786b78d 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -830,7 +830,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -52,7 +52,7 @@ index 0b5ea21..f959fdf 100644 getHandle().playerConnection.sendPacket(new Packet250CustomPayload("MC|TPack", message)); diff --git a/src/main/resources/configurations/bukkit.yml b/src/main/resources/configurations/bukkit.yml -index 62bf79a..8d07ae2 100644 +index f0d9129..cdf66e1 100644 --- a/src/main/resources/configurations/bukkit.yml +++ b/src/main/resources/configurations/bukkit.yml @@ -39,6 +39,7 @@ settings: 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 f7a1e6a5d2..365515c933 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 027ce59bdca943351a403d8bec0e6397db887175 Mon Sep 17 00:00:00 2001 +From 0472f861774f4b595adfe6554d6418095218be90 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 b28f745..f2c52f4 100644 +index 7fafe01..2f4dcd9 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; @@ -44,7 +44,7 @@ index b28f745..f2c52f4 100644 public static void initialize(CraftServer server, SimpleCommandMap commandMap, YamlConfiguration configuration) { commandMap.register("bukkit", new org.bukkit.craftbukkit.command.TicksPerSecondCommand("tps")); -@@ -381,7 +383,9 @@ public class Spigot { +@@ -380,7 +382,9 @@ public class Spigot { } /** diff --git a/CraftBukkit-Patches/0040-Fixes-BUKKIT-3893-Close-world-save-files-when-world-.patch b/CraftBukkit-Patches/0040-Fixes-BUKKIT-3893-Close-world-save-files-when-world-.patch index d95e1edf3a..ae612c8fb0 100644 --- a/CraftBukkit-Patches/0040-Fixes-BUKKIT-3893-Close-world-save-files-when-world-.patch +++ b/CraftBukkit-Patches/0040-Fixes-BUKKIT-3893-Close-world-save-files-when-world-.patch @@ -1,4 +1,4 @@ -From 0f9b140ce9f9ffde372ff7b9eec431bb71861e69 Mon Sep 17 00:00:00 2001 +From a455b71218576824266aba2ec75d19dbe642081d Mon Sep 17 00:00:00 2001 From: Antony Riley Date: Wed, 27 Mar 2013 01:41:54 +0200 Subject: [PATCH] Fixes BUKKIT-3893 - Close world save files when world is @@ -19,7 +19,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 028e7dd..94d6728 100644 +index fc9170f..bfa19e6 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; @@ -31,7 +31,7 @@ index 028e7dd..94d6728 100644 import net.minecraft.server.ServerNBTManager; import net.minecraft.server.WorldLoaderServer; import net.minecraft.server.WorldManager; -@@ -832,6 +834,30 @@ public final class CraftServer implements Server { +@@ -831,6 +833,30 @@ public final class CraftServer implements Server { worlds.remove(world.getName().toLowerCase()); console.worlds.remove(console.worlds.indexOf(handle));