From f2d34e09b47fc4b44a158567148c77633f702787 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 14 May 2013 12:08:11 +1000 Subject: [PATCH] Add base patch for Spigot config --- .../0004-Spigot-Configuration.patch | 30 +++++++++++++++++++ ...ilter.patch => 0005-Proxy-IP-Filter.patch} | 2 +- ...0006-Merge-tweaks-and-configuration.patch} | 2 +- ...weaks.patch => 0007-LongHash-Tweaks.patch} | 2 +- ...ch => 0008-Async-Operation-Catching.patch} | 2 +- ...istance.patch => 0009-View-Distance.patch} | 6 ++-- ...ing-of-NibbleArrays-only-allocate-b.patch} | 2 +- ...sed-to-unload-chunks-for-the-client.patch} | 4 +-- ...free-but-safe-chunk-reference-cache.patch} | 4 +-- ...ation-sleep-for-as-long-as-possible.patch} | 2 +- ...tch => 0014-Improved-Timings-System.patch} | 2 +- ...> 0015-Add-oreobfuscator-for-Spigot.patch} | 14 ++++----- ...es-in-chunks-being-processed-for-th.patch} | 4 +-- ...e-and-warn-about-null-tile-entities.patch} | 4 +-- ...tch => 0018-Entity-Activation-Range.patch} | 2 +- ...the-Metrics-system-to-be-closer-to-.patch} | 4 +-- ...hread.patch => 0020-Watchdog-Thread.patch} | 2 +- .../{0020-Netty.patch => 0021-Netty.patch} | 21 +++---------- ...on-itself-instead-of-next-to-bed-Fi.patch} | 2 +- ...-on-CraftPlayer.getBedSpawnLocation.patch} | 2 +- ...-missing-HangingBreakEvent-when-Ent.patch} | 2 +- ...3667-Faux-sleepers-wake-up-normally.patch} | 2 +- ...patch => 0026-PlayerItemDamageEvent.patch} | 2 +- ...ch => 0027-Faster-UUID-for-entities.patch} | 2 +- ...ch => 0028-Prevent-NPE-in-CraftSign.patch} | 2 +- ...9-Stage-DataWatcher-WatchableObject.patch} | 2 +- ...atch => 0030-Entity-Tracking-Ranges.patch} | 2 +- ...rt.patch => 0031-BungeeCord-Support.patch} | 4 +-- ...ch => 0032-Texture-Pack-Resolutions.patch} | 4 +-- ... => 0033-Limit-Custom-Map-Rendering.patch} | 2 +- ...ption-for-disabled-plugin-tasks.-Fi.patch} | 2 +- ...nt-now-can-return-if-the-click-was-.patch} | 2 +- ...> 0036-Enable-Improved-ping-sending.patch} | 2 +- ...t-handshake-spam-from-invalid-names.patch} | 2 +- ...s-for-randomly-spawned-creatures-to.patch} | 2 +- ...ch => 0039-Thread-Naming-and-Tweaks.patch} | 4 +-- ...-Close-world-save-files-when-world-.patch} | 2 +- ...Optimized-version-of-LocaleLanguage.patch} | 2 +- ...-list-performance-on-chunk-unloads-.patch} | 4 +-- 39 files changed, 88 insertions(+), 71 deletions(-) create mode 100644 CraftBukkit-Patches/0004-Spigot-Configuration.patch rename CraftBukkit-Patches/{0004-Proxy-IP-Filter.patch => 0005-Proxy-IP-Filter.patch} (98%) rename CraftBukkit-Patches/{0005-Merge-tweaks-and-configuration.patch => 0006-Merge-tweaks-and-configuration.patch} (99%) rename CraftBukkit-Patches/{0006-LongHash-Tweaks.patch => 0007-LongHash-Tweaks.patch} (98%) rename CraftBukkit-Patches/{0007-Async-Operation-Catching.patch => 0008-Async-Operation-Catching.patch} (98%) rename CraftBukkit-Patches/{0008-View-Distance.patch => 0009-View-Distance.patch} (96%) rename CraftBukkit-Patches/{0009-Implement-lightening-of-NibbleArrays-only-allocate-b.patch => 0010-Implement-lightening-of-NibbleArrays-only-allocate-b.patch} (99%) rename CraftBukkit-Patches/{0010-Optimize-packet-used-to-unload-chunks-for-the-client.patch => 0011-Optimize-packet-used-to-unload-chunks-for-the-client.patch} (96%) rename CraftBukkit-Patches/{0011-Alternate-sync-free-but-safe-chunk-reference-cache.patch => 0012-Alternate-sync-free-but-safe-chunk-reference-cache.patch} (93%) rename CraftBukkit-Patches/{0012-Tick-loop-optimization-sleep-for-as-long-as-possible.patch => 0013-Tick-loop-optimization-sleep-for-as-long-as-possible.patch} (98%) rename CraftBukkit-Patches/{0013-Improved-Timings-System.patch => 0014-Improved-Timings-System.patch} (99%) rename CraftBukkit-Patches/{0014-Add-oreobfuscator-for-Spigot.patch => 0015-Add-oreobfuscator-for-Spigot.patch} (98%) rename CraftBukkit-Patches/{0015-Only-count-entities-in-chunks-being-processed-for-th.patch => 0016-Only-count-entities-in-chunks-being-processed-for-th.patch} (98%) rename CraftBukkit-Patches/{0016-Detect-remove-and-warn-about-null-tile-entities.patch => 0017-Detect-remove-and-warn-about-null-tile-entities.patch} (92%) rename CraftBukkit-Patches/{0017-Entity-Activation-Range.patch => 0018-Entity-Activation-Range.patch} (99%) rename CraftBukkit-Patches/{0018-Metrics.-Rewrite-the-Metrics-system-to-be-closer-to-.patch => 0019-Metrics.-Rewrite-the-Metrics-system-to-be-closer-to-.patch} (99%) rename CraftBukkit-Patches/{0019-Watchdog-Thread.patch => 0020-Watchdog-Thread.patch} (99%) rename CraftBukkit-Patches/{0020-Netty.patch => 0021-Netty.patch} (98%) rename CraftBukkit-Patches/{0021-Return-bed-location-itself-instead-of-next-to-bed-Fi.patch => 0022-Return-bed-location-itself-instead-of-next-to-bed-Fi.patch} (95%) rename CraftBukkit-Patches/{0022-Remove-dependency-on-CraftPlayer.getBedSpawnLocation.patch => 0023-Remove-dependency-on-CraftPlayer.getBedSpawnLocation.patch} (96%) rename CraftBukkit-Patches/{0023-BUKKIT-3661-fixed-missing-HangingBreakEvent-when-Ent.patch => 0024-BUKKIT-3661-fixed-missing-HangingBreakEvent-when-Ent.patch} (96%) rename CraftBukkit-Patches/{0024-Adds-BUKKIT-3667-Faux-sleepers-wake-up-normally.patch => 0025-Adds-BUKKIT-3667-Faux-sleepers-wake-up-normally.patch} (93%) rename CraftBukkit-Patches/{0025-PlayerItemDamageEvent.patch => 0026-PlayerItemDamageEvent.patch} (97%) rename CraftBukkit-Patches/{0026-Faster-UUID-for-entities.patch => 0027-Faster-UUID-for-entities.patch} (93%) rename CraftBukkit-Patches/{0027-Prevent-NPE-in-CraftSign.patch => 0028-Prevent-NPE-in-CraftSign.patch} (96%) rename CraftBukkit-Patches/{0028-Stage-DataWatcher-WatchableObject.patch => 0029-Stage-DataWatcher-WatchableObject.patch} (99%) rename CraftBukkit-Patches/{0029-Entity-Tracking-Ranges.patch => 0030-Entity-Tracking-Ranges.patch} (99%) rename CraftBukkit-Patches/{0030-BungeeCord-Support.patch => 0031-BungeeCord-Support.patch} (98%) rename CraftBukkit-Patches/{0031-Texture-Pack-Resolutions.patch => 0032-Texture-Pack-Resolutions.patch} (97%) rename CraftBukkit-Patches/{0032-Limit-Custom-Map-Rendering.patch => 0033-Limit-Custom-Map-Rendering.patch} (98%) rename CraftBukkit-Patches/{0033-Revert-Throw-exception-for-disabled-plugin-tasks.-Fi.patch => 0034-Revert-Throw-exception-for-disabled-plugin-tasks.-Fi.patch} (95%) rename CraftBukkit-Patches/{0034-InventoryClickEvent-now-can-return-if-the-click-was-.patch => 0035-InventoryClickEvent-now-can-return-if-the-click-was-.patch} (97%) rename CraftBukkit-Patches/{0035-Enable-Improved-ping-sending.patch => 0036-Enable-Improved-ping-sending.patch} (97%) rename CraftBukkit-Patches/{0036-Prevent-handshake-spam-from-invalid-names.patch => 0037-Prevent-handshake-spam-from-invalid-names.patch} (97%) rename CraftBukkit-Patches/{0037-Save-entity-counts-for-randomly-spawned-creatures-to.patch => 0038-Save-entity-counts-for-randomly-spawned-creatures-to.patch} (97%) rename CraftBukkit-Patches/{0038-Thread-Naming-and-Tweaks.patch => 0039-Thread-Naming-and-Tweaks.patch} (97%) rename CraftBukkit-Patches/{0039-Fixes-BUKKIT-3893-Close-world-save-files-when-world-.patch => 0040-Fixes-BUKKIT-3893-Close-world-save-files-when-world-.patch} (97%) rename CraftBukkit-Patches/{0040-Optimized-version-of-LocaleLanguage.patch => 0041-Optimized-version-of-LocaleLanguage.patch} (98%) rename CraftBukkit-Patches/{0041-Improve-next-tick-list-performance-on-chunk-unloads-.patch => 0042-Improve-next-tick-list-performance-on-chunk-unloads-.patch} (99%) diff --git a/CraftBukkit-Patches/0004-Spigot-Configuration.patch b/CraftBukkit-Patches/0004-Spigot-Configuration.patch new file mode 100644 index 0000000000..c7863e829a --- /dev/null +++ b/CraftBukkit-Patches/0004-Spigot-Configuration.patch @@ -0,0 +1,30 @@ +From d22f6b12f4bfca69832a5f9fd17be298fe5dcbe7 Mon Sep 17 00:00:00 2001 +From: md_5 +Date: Tue, 14 May 2013 12:06:27 +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..10ce69d 100644 +--- a/src/main/java/net/minecraft/server/DedicatedServer.java ++++ b/src/main/java/net/minecraft/server/DedicatedServer.java +@@ -55,6 +55,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer + + this.getLogger().info("Loading properties"); + this.propertyManager = new PropertyManager(this.options, this.getLogger()); // CraftBukkit - CLI argument support ++ this.a((PlayerList) (new DedicatedPlayerList(this))); // Spigot - moved up from below + if (this.I()) { + this.d("127.0.0.1"); + } else { +@@ -103,7 +104,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer + return false; + } + +- this.a((PlayerList) (new DedicatedPlayerList(this))); // CraftBukkit ++ // this.a((PlayerList) (new DedicatedPlayerList(this))); // CraftBukkit // Spigot - moved to top of method + + if (!this.getOnlineMode()) { + this.getLogger().warning("**** SERVER IS RUNNING IN OFFLINE/INSECURE MODE!"); +-- +1.8.2.1 + diff --git a/CraftBukkit-Patches/0004-Proxy-IP-Filter.patch b/CraftBukkit-Patches/0005-Proxy-IP-Filter.patch similarity index 98% rename from CraftBukkit-Patches/0004-Proxy-IP-Filter.patch rename to CraftBukkit-Patches/0005-Proxy-IP-Filter.patch index 93638d55cf..ffa7e3424b 100644 --- a/CraftBukkit-Patches/0004-Proxy-IP-Filter.patch +++ b/CraftBukkit-Patches/0005-Proxy-IP-Filter.patch @@ -1,4 +1,4 @@ -From dc11955b66495dc0dc88e9e1775ef3de1ed3c06e Mon Sep 17 00:00:00 2001 +From 442c50bdefd5d2e1ab02bec593da75eed557ea05 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 23 Apr 2013 11:22:07 +1000 Subject: [PATCH] Proxy IP Filter diff --git a/CraftBukkit-Patches/0005-Merge-tweaks-and-configuration.patch b/CraftBukkit-Patches/0006-Merge-tweaks-and-configuration.patch similarity index 99% rename from CraftBukkit-Patches/0005-Merge-tweaks-and-configuration.patch rename to CraftBukkit-Patches/0006-Merge-tweaks-and-configuration.patch index 27454dba65..bfa25dcdd9 100644 --- a/CraftBukkit-Patches/0005-Merge-tweaks-and-configuration.patch +++ b/CraftBukkit-Patches/0006-Merge-tweaks-and-configuration.patch @@ -1,4 +1,4 @@ -From 5399bd4fdda73b55589eb48f69ee46ff3363c10d Mon Sep 17 00:00:00 2001 +From 8786751ea0257600e6c0cbd3be6e3a8ddb4b699b Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 23 Mar 2013 09:46:33 +1100 Subject: [PATCH] Merge tweaks and configuration diff --git a/CraftBukkit-Patches/0006-LongHash-Tweaks.patch b/CraftBukkit-Patches/0007-LongHash-Tweaks.patch similarity index 98% rename from CraftBukkit-Patches/0006-LongHash-Tweaks.patch rename to CraftBukkit-Patches/0007-LongHash-Tweaks.patch index d4b29b6a69..e4de9676ed 100644 --- a/CraftBukkit-Patches/0006-LongHash-Tweaks.patch +++ b/CraftBukkit-Patches/0007-LongHash-Tweaks.patch @@ -1,4 +1,4 @@ -From e452f4069bf9976655a2c6710d9b9cd28e2d016b Mon Sep 17 00:00:00 2001 +From 3f10525ca3a5e8c488a1a9bbfe9fde6f72780b46 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 23 Mar 2013 09:29:43 +1100 Subject: [PATCH] LongHash Tweaks. diff --git a/CraftBukkit-Patches/0007-Async-Operation-Catching.patch b/CraftBukkit-Patches/0008-Async-Operation-Catching.patch similarity index 98% rename from CraftBukkit-Patches/0007-Async-Operation-Catching.patch rename to CraftBukkit-Patches/0008-Async-Operation-Catching.patch index 5062be7478..d9d72001fb 100644 --- a/CraftBukkit-Patches/0007-Async-Operation-Catching.patch +++ b/CraftBukkit-Patches/0008-Async-Operation-Catching.patch @@ -1,4 +1,4 @@ -From becc64aca459c1337bc4499542847edd3921a542 Mon Sep 17 00:00:00 2001 +From e0329a8be1bde7ee5fb46501ff9e65bf93568e45 Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 7 Mar 2013 20:12:46 +1100 Subject: [PATCH] Async Operation Catching diff --git a/CraftBukkit-Patches/0008-View-Distance.patch b/CraftBukkit-Patches/0009-View-Distance.patch similarity index 96% rename from CraftBukkit-Patches/0008-View-Distance.patch rename to CraftBukkit-Patches/0009-View-Distance.patch index 241f7da390..bcd7b28783 100644 --- a/CraftBukkit-Patches/0008-View-Distance.patch +++ b/CraftBukkit-Patches/0009-View-Distance.patch @@ -1,4 +1,4 @@ -From dccf82f4ad3c6c477e07464c5f47e75e2cc73661 Mon Sep 17 00:00:00 2001 +From 2b94f7c77f07a6de7a567a234e562dd76198ec3b Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 23 Mar 2013 09:52:41 +1100 Subject: [PATCH] View Distance @@ -19,7 +19,7 @@ index 0dfd190..c543bed 100644 } else { this.e = i; diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 0b7ac47..a25cbf3 100644 +index 8114910..3a321da 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -51,7 +51,7 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate @@ -32,7 +32,7 @@ index 0b7ac47..a25cbf3 100644 this.entitiesById = new IntHashMap(); } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index f5e63f8..7c48dad 100644 +index 9e7d8ab..44d1842 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -120,6 +120,9 @@ public class CraftWorld implements World { diff --git a/CraftBukkit-Patches/0009-Implement-lightening-of-NibbleArrays-only-allocate-b.patch b/CraftBukkit-Patches/0010-Implement-lightening-of-NibbleArrays-only-allocate-b.patch similarity index 99% rename from CraftBukkit-Patches/0009-Implement-lightening-of-NibbleArrays-only-allocate-b.patch rename to CraftBukkit-Patches/0010-Implement-lightening-of-NibbleArrays-only-allocate-b.patch index d0886169cb..6849324781 100644 --- a/CraftBukkit-Patches/0009-Implement-lightening-of-NibbleArrays-only-allocate-b.patch +++ b/CraftBukkit-Patches/0010-Implement-lightening-of-NibbleArrays-only-allocate-b.patch @@ -1,4 +1,4 @@ -From 7040b62affceb63b6dd01382023f17fd136450aa Mon Sep 17 00:00:00 2001 +From b1011da0e288e3f61f8eadb6e6c15b9c859b81d9 Mon Sep 17 00:00:00 2001 From: Mike Primm Date: Sun, 13 Jan 2013 03:49:07 -0800 Subject: [PATCH] Implement 'lightening' of NibbleArrays - only allocate diff --git a/CraftBukkit-Patches/0010-Optimize-packet-used-to-unload-chunks-for-the-client.patch b/CraftBukkit-Patches/0011-Optimize-packet-used-to-unload-chunks-for-the-client.patch similarity index 96% rename from CraftBukkit-Patches/0010-Optimize-packet-used-to-unload-chunks-for-the-client.patch rename to CraftBukkit-Patches/0011-Optimize-packet-used-to-unload-chunks-for-the-client.patch index 58ee97e4fe..adbcf8e1da 100644 --- a/CraftBukkit-Patches/0010-Optimize-packet-used-to-unload-chunks-for-the-client.patch +++ b/CraftBukkit-Patches/0011-Optimize-packet-used-to-unload-chunks-for-the-client.patch @@ -1,4 +1,4 @@ -From 9542a9f8645de176e39d33694e930872ee7a42d8 Mon Sep 17 00:00:00 2001 +From 5bb52be208f1e396596280ff658b8a6e91b33265 Mon Sep 17 00:00:00 2001 From: Ammar Askar Date: Fri, 18 Jan 2013 16:20:01 +0500 Subject: [PATCH] Optimize packet used to unload chunks for the client @@ -6,7 +6,7 @@ Subject: [PATCH] Optimize packet used to unload chunks for the client At the moment telling a client to unload a chunk involves calling the entire chunk from memory, deflating it and then sending it through the pipes even though the client ignores it and based on the bitmap simply unloads the chunk, and to add the cherry on top, this is done on the main server thread. diff --git a/src/main/java/net/minecraft/server/Packet51MapChunk.java b/src/main/java/net/minecraft/server/Packet51MapChunk.java -index ee179be..b51d90c 100644 +index 3c3bdbf..d11c0ea 100644 --- a/src/main/java/net/minecraft/server/Packet51MapChunk.java +++ b/src/main/java/net/minecraft/server/Packet51MapChunk.java @@ -18,11 +18,24 @@ public class Packet51MapChunk extends Packet { diff --git a/CraftBukkit-Patches/0011-Alternate-sync-free-but-safe-chunk-reference-cache.patch b/CraftBukkit-Patches/0012-Alternate-sync-free-but-safe-chunk-reference-cache.patch similarity index 93% rename from CraftBukkit-Patches/0011-Alternate-sync-free-but-safe-chunk-reference-cache.patch rename to CraftBukkit-Patches/0012-Alternate-sync-free-but-safe-chunk-reference-cache.patch index d40494a7c4..a293d3d1f9 100644 --- a/CraftBukkit-Patches/0011-Alternate-sync-free-but-safe-chunk-reference-cache.patch +++ b/CraftBukkit-Patches/0012-Alternate-sync-free-but-safe-chunk-reference-cache.patch @@ -1,11 +1,11 @@ -From 6591b85a8d8dba678747feafc3e0bcec83bd6979 Mon Sep 17 00:00:00 2001 +From 09c0afb41d80f2474769b7360582e83b459923ba Mon Sep 17 00:00:00 2001 From: Mike Primm Date: Wed, 16 Jan 2013 15:27:22 -0600 Subject: [PATCH] Alternate, sync-free-but-safe chunk reference cache diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index af85d8b..eb03aba 100644 +index 3f9c453..6d59bc3 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -293,15 +293,13 @@ public abstract class World implements IBlockAccess { diff --git a/CraftBukkit-Patches/0012-Tick-loop-optimization-sleep-for-as-long-as-possible.patch b/CraftBukkit-Patches/0013-Tick-loop-optimization-sleep-for-as-long-as-possible.patch similarity index 98% rename from CraftBukkit-Patches/0012-Tick-loop-optimization-sleep-for-as-long-as-possible.patch rename to CraftBukkit-Patches/0013-Tick-loop-optimization-sleep-for-as-long-as-possible.patch index 42d8adff5f..e9399590ed 100644 --- a/CraftBukkit-Patches/0012-Tick-loop-optimization-sleep-for-as-long-as-possible.patch +++ b/CraftBukkit-Patches/0013-Tick-loop-optimization-sleep-for-as-long-as-possible.patch @@ -1,4 +1,4 @@ -From 80157a1f1af5e8dbdc7c3b10e355e1048970cea5 Mon Sep 17 00:00:00 2001 +From 33632725e31f17845bf9b111ef3a500aa3ace5f3 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 3 Feb 2013 12:28:17 +1100 Subject: [PATCH] Tick loop optimization - sleep for as long as possible. diff --git a/CraftBukkit-Patches/0013-Improved-Timings-System.patch b/CraftBukkit-Patches/0014-Improved-Timings-System.patch similarity index 99% rename from CraftBukkit-Patches/0013-Improved-Timings-System.patch rename to CraftBukkit-Patches/0014-Improved-Timings-System.patch index 0fa93060be..88d2338a28 100644 --- a/CraftBukkit-Patches/0013-Improved-Timings-System.patch +++ b/CraftBukkit-Patches/0014-Improved-Timings-System.patch @@ -1,4 +1,4 @@ -From 2618c34301c92122133a456f41ce4649bb552f0f Mon Sep 17 00:00:00 2001 +From df973d43d513df224bd4b4f0c44107eff74c299f Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 10 Jan 2013 00:18:11 -0500 Subject: [PATCH] Improved Timings System diff --git a/CraftBukkit-Patches/0014-Add-oreobfuscator-for-Spigot.patch b/CraftBukkit-Patches/0015-Add-oreobfuscator-for-Spigot.patch similarity index 98% rename from CraftBukkit-Patches/0014-Add-oreobfuscator-for-Spigot.patch rename to CraftBukkit-Patches/0015-Add-oreobfuscator-for-Spigot.patch index 4dc59828b9..0ab8c57c0d 100644 --- a/CraftBukkit-Patches/0014-Add-oreobfuscator-for-Spigot.patch +++ b/CraftBukkit-Patches/0015-Add-oreobfuscator-for-Spigot.patch @@ -1,4 +1,4 @@ -From 1155f9606b7e8061b1ab5c19910133f7a0b40192 Mon Sep 17 00:00:00 2001 +From 8639462ceb382a8d29919d16524a1c8c22ceaf10 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. @@ -17,7 +17,7 @@ index 17d837d..ecc52b9 100644 if (this.onGround) { diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java -index b43953a..b907562 100644 +index ef220c1..63f43b8 100644 --- a/src/main/java/net/minecraft/server/Explosion.java +++ b/src/main/java/net/minecraft/server/Explosion.java @@ -240,6 +240,7 @@ public class Explosion { @@ -29,7 +29,7 @@ index b43953a..b907562 100644 double d0 = (double) ((float) i + this.world.random.nextFloat()); double d1 = (double) ((float) j + this.world.random.nextFloat()); diff --git a/src/main/java/net/minecraft/server/Packet51MapChunk.java b/src/main/java/net/minecraft/server/Packet51MapChunk.java -index b51d90c..84dbb88 100644 +index d11c0ea..2fcd7f7 100644 --- a/src/main/java/net/minecraft/server/Packet51MapChunk.java +++ b/src/main/java/net/minecraft/server/Packet51MapChunk.java @@ -36,7 +36,7 @@ public class Packet51MapChunk extends Packet { @@ -134,7 +134,7 @@ index 20f8e8a..3792638 100644 for (k = 0; k < 16; ++k) { if ((this.f & 1 << k) != 0) { diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java -index d03174b..354d4f6 100644 +index 1243d1d..1a31112 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 { @@ -150,7 +150,7 @@ index d03174b..354d4f6 100644 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 e5ceed1..20d38b4 100644 +index 12c5f81..767f3c3 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 { @@ -168,7 +168,7 @@ index e5ceed1..20d38b4 100644 private boolean value = true; } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 7c48dad..77078a1 100644 +index 44d1842..7d05a77 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -123,6 +123,8 @@ public class CraftWorld implements World { @@ -197,7 +197,7 @@ index 7c48dad..77078a1 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 b64a7ca..58361fa 100644 +index 67477f4..c4eea4d 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 { diff --git a/CraftBukkit-Patches/0015-Only-count-entities-in-chunks-being-processed-for-th.patch b/CraftBukkit-Patches/0016-Only-count-entities-in-chunks-being-processed-for-th.patch similarity index 98% rename from CraftBukkit-Patches/0015-Only-count-entities-in-chunks-being-processed-for-th.patch rename to CraftBukkit-Patches/0016-Only-count-entities-in-chunks-being-processed-for-th.patch index b1bb30efb9..f9a4da1a26 100644 --- a/CraftBukkit-Patches/0015-Only-count-entities-in-chunks-being-processed-for-th.patch +++ b/CraftBukkit-Patches/0016-Only-count-entities-in-chunks-being-processed-for-th.patch @@ -1,4 +1,4 @@ -From bfbd9c222d0c5d8169ea3545e05c318e42835dd3 Mon Sep 17 00:00:00 2001 +From 01f20660e4bc91998c091310746eb05d1d0fe782 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 29 Jan 2013 13:25:53 -0500 Subject: [PATCH] Only count entities in chunks being processed for the spawn @@ -6,7 +6,7 @@ Subject: [PATCH] Only count entities in chunks being processed for the spawn diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java -index b3e2818..6362a37 100644 +index 056100f..3529074 100644 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java @@ -16,6 +16,7 @@ public final class SpawnerCreature { diff --git a/CraftBukkit-Patches/0016-Detect-remove-and-warn-about-null-tile-entities.patch b/CraftBukkit-Patches/0017-Detect-remove-and-warn-about-null-tile-entities.patch similarity index 92% rename from CraftBukkit-Patches/0016-Detect-remove-and-warn-about-null-tile-entities.patch rename to CraftBukkit-Patches/0017-Detect-remove-and-warn-about-null-tile-entities.patch index 707c66988d..65f3d33226 100644 --- a/CraftBukkit-Patches/0016-Detect-remove-and-warn-about-null-tile-entities.patch +++ b/CraftBukkit-Patches/0017-Detect-remove-and-warn-about-null-tile-entities.patch @@ -1,11 +1,11 @@ -From 640e63f7708ad09e2a48f86cbd94692d5bd12094 Mon Sep 17 00:00:00 2001 +From 9318443175872f9a1c21c351148b052778625c54 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 3 Feb 2013 09:20:19 +1100 Subject: [PATCH] Detect, remove and warn about null tile entities. diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 1bed9ed..51816e4 100644 +index feb657b..c547ecc 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1333,6 +1333,13 @@ public abstract class World implements IBlockAccess { diff --git a/CraftBukkit-Patches/0017-Entity-Activation-Range.patch b/CraftBukkit-Patches/0018-Entity-Activation-Range.patch similarity index 99% rename from CraftBukkit-Patches/0017-Entity-Activation-Range.patch rename to CraftBukkit-Patches/0018-Entity-Activation-Range.patch index 348da7ed34..891d3c6704 100644 --- a/CraftBukkit-Patches/0017-Entity-Activation-Range.patch +++ b/CraftBukkit-Patches/0018-Entity-Activation-Range.patch @@ -1,4 +1,4 @@ -From 33f534343e67d6e7e74240de7573806f35a1c160 Mon Sep 17 00:00:00 2001 +From 4bc75aa65c4aaa26d5158594602168b2cfd62875 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 3 Feb 2013 05:10:21 -0500 Subject: [PATCH] Entity Activation Range diff --git a/CraftBukkit-Patches/0018-Metrics.-Rewrite-the-Metrics-system-to-be-closer-to-.patch b/CraftBukkit-Patches/0019-Metrics.-Rewrite-the-Metrics-system-to-be-closer-to-.patch similarity index 99% rename from CraftBukkit-Patches/0018-Metrics.-Rewrite-the-Metrics-system-to-be-closer-to-.patch rename to CraftBukkit-Patches/0019-Metrics.-Rewrite-the-Metrics-system-to-be-closer-to-.patch index 2730f2f6b3..08878a69c7 100644 --- a/CraftBukkit-Patches/0018-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 c5c660bfcf54efd713bb1bb241cc1acdb294e126 Mon Sep 17 00:00:00 2001 +From c4c47af95920411ffd43ca773f3aa76b7a797f6b 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 61cd44d..88c2383 100644 +index 3e4a0a9..c81503e 100644 --- a/src/main/java/org/bukkit/craftbukkit/Spigot.java +++ b/src/main/java/org/bukkit/craftbukkit/Spigot.java @@ -1,8 +1,10 @@ diff --git a/CraftBukkit-Patches/0019-Watchdog-Thread.patch b/CraftBukkit-Patches/0020-Watchdog-Thread.patch similarity index 99% rename from CraftBukkit-Patches/0019-Watchdog-Thread.patch rename to CraftBukkit-Patches/0020-Watchdog-Thread.patch index 6aaf9e678f..b75ae69ea1 100644 --- a/CraftBukkit-Patches/0019-Watchdog-Thread.patch +++ b/CraftBukkit-Patches/0020-Watchdog-Thread.patch @@ -1,4 +1,4 @@ -From 3b9b44f5c52fab6917df74a9a5408ca93e3ba9e9 Mon Sep 17 00:00:00 2001 +From 306989a61052788166338af01c3953558549bc23 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 23 Feb 2013 12:33:20 +1100 Subject: [PATCH] Watchdog Thread. diff --git a/CraftBukkit-Patches/0020-Netty.patch b/CraftBukkit-Patches/0021-Netty.patch similarity index 98% rename from CraftBukkit-Patches/0020-Netty.patch rename to CraftBukkit-Patches/0021-Netty.patch index d9a299b533..79306b4794 100644 --- a/CraftBukkit-Patches/0020-Netty.patch +++ b/CraftBukkit-Patches/0021-Netty.patch @@ -1,4 +1,4 @@ -From 08b0653201cd272203727057469a8bf0f842c0f2 Mon Sep 17 00:00:00 2001 +From 674cdb53ac5d08828c63aad1abd6b1a2f37fb9e6 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 23 Apr 2013 11:47:32 +1000 Subject: [PATCH] Netty @@ -48,15 +48,11 @@ index 274fd43..b0891ff 100644 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index 7261dc9..097be65 100644 +index 10ce69d..e4f1cbe 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java -@@ -92,10 +92,10 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer - - this.getLogger().info("Generating keypair"); - this.a(MinecraftEncryption.b()); -- this.getLogger().info("Starting Minecraft server on " + (this.getServerIp().length() == 0 ? "*" : this.getServerIp()) + ":" + this.G()); -+ this.a((PlayerList) (new DedicatedPlayerList(this))); // CraftBukkit +@@ -96,7 +96,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer + this.getLogger().info("Starting Minecraft server on " + (this.getServerIp().length() == 0 ? "*" : this.getServerIp()) + ":" + this.G()); try { - this.r = new DedicatedServerConnection(this, inetaddress, this.G()); @@ -64,15 +60,6 @@ index 7261dc9..097be65 100644 } catch (Throwable ioexception) { // CraftBukkit - IOException -> Throwable this.getLogger().warning("**** FAILED TO BIND TO PORT!"); this.getLogger().warning("The exception was: {0}", new Object[] { ioexception.toString()}); -@@ -103,8 +103,6 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer - return false; - } - -- this.a((PlayerList) (new DedicatedPlayerList(this))); // CraftBukkit -- - if (!this.getOnlineMode()) { - this.getLogger().warning("**** SERVER IS RUNNING IN OFFLINE/INSECURE MODE!"); - this.getLogger().warning("The server will make no attempt to authenticate usernames. Beware."); diff --git a/src/main/java/net/minecraft/server/DedicatedServerConnectionThread.java b/src/main/java/net/minecraft/server/DedicatedServerConnectionThread.java index ef7e10d..5f2e42e 100644 --- a/src/main/java/net/minecraft/server/DedicatedServerConnectionThread.java diff --git a/CraftBukkit-Patches/0021-Return-bed-location-itself-instead-of-next-to-bed-Fi.patch b/CraftBukkit-Patches/0022-Return-bed-location-itself-instead-of-next-to-bed-Fi.patch similarity index 95% rename from CraftBukkit-Patches/0021-Return-bed-location-itself-instead-of-next-to-bed-Fi.patch rename to CraftBukkit-Patches/0022-Return-bed-location-itself-instead-of-next-to-bed-Fi.patch index 6e16b6dc18..fc248ebe95 100644 --- a/CraftBukkit-Patches/0021-Return-bed-location-itself-instead-of-next-to-bed-Fi.patch +++ b/CraftBukkit-Patches/0022-Return-bed-location-itself-instead-of-next-to-bed-Fi.patch @@ -1,4 +1,4 @@ -From 6ba8ff41998d09eba7c4ae798d27c21ff1fd5762 Mon Sep 17 00:00:00 2001 +From 5a59a9e0be3ca5e595a225cafb14dc161ad49840 Mon Sep 17 00:00:00 2001 From: EdGruberman Date: Fri, 22 Feb 2013 09:23:51 -0700 Subject: [PATCH] Return bed location itself instead of next to bed; Fixes diff --git a/CraftBukkit-Patches/0022-Remove-dependency-on-CraftPlayer.getBedSpawnLocation.patch b/CraftBukkit-Patches/0023-Remove-dependency-on-CraftPlayer.getBedSpawnLocation.patch similarity index 96% rename from CraftBukkit-Patches/0022-Remove-dependency-on-CraftPlayer.getBedSpawnLocation.patch rename to CraftBukkit-Patches/0023-Remove-dependency-on-CraftPlayer.getBedSpawnLocation.patch index 679b449578..79b34e830c 100644 --- a/CraftBukkit-Patches/0022-Remove-dependency-on-CraftPlayer.getBedSpawnLocation.patch +++ b/CraftBukkit-Patches/0023-Remove-dependency-on-CraftPlayer.getBedSpawnLocation.patch @@ -1,4 +1,4 @@ -From 11b3b6b9add95dce5e0cbf9073b3bdd6bf04dd86 Mon Sep 17 00:00:00 2001 +From 34556739aa826604755ba587d45c4a9c7270ee5d Mon Sep 17 00:00:00 2001 From: EdGruberman Date: Tue, 12 Feb 2013 16:17:31 -0700 Subject: [PATCH] Remove dependency on CraftPlayer.getBedSpawnLocation; Fixes diff --git a/CraftBukkit-Patches/0023-BUKKIT-3661-fixed-missing-HangingBreakEvent-when-Ent.patch b/CraftBukkit-Patches/0024-BUKKIT-3661-fixed-missing-HangingBreakEvent-when-Ent.patch similarity index 96% rename from CraftBukkit-Patches/0023-BUKKIT-3661-fixed-missing-HangingBreakEvent-when-Ent.patch rename to CraftBukkit-Patches/0024-BUKKIT-3661-fixed-missing-HangingBreakEvent-when-Ent.patch index ba3c9e02fb..fcfc08f0f6 100644 --- a/CraftBukkit-Patches/0023-BUKKIT-3661-fixed-missing-HangingBreakEvent-when-Ent.patch +++ b/CraftBukkit-Patches/0024-BUKKIT-3661-fixed-missing-HangingBreakEvent-when-Ent.patch @@ -1,4 +1,4 @@ -From bfca37c383ed00f8bd8bc0bc7d6ef8cbb88a8956 Mon Sep 17 00:00:00 2001 +From d179b3bdf151369ac89b30a7b80159fa5e0cd0cf Mon Sep 17 00:00:00 2001 From: Yariv Livay Date: Sat, 2 Mar 2013 09:36:52 +1100 Subject: [PATCH] BUKKIT-3661, fixed missing HangingBreakEvent when diff --git a/CraftBukkit-Patches/0024-Adds-BUKKIT-3667-Faux-sleepers-wake-up-normally.patch b/CraftBukkit-Patches/0025-Adds-BUKKIT-3667-Faux-sleepers-wake-up-normally.patch similarity index 93% rename from CraftBukkit-Patches/0024-Adds-BUKKIT-3667-Faux-sleepers-wake-up-normally.patch rename to CraftBukkit-Patches/0025-Adds-BUKKIT-3667-Faux-sleepers-wake-up-normally.patch index 9f8a3b6cee..2abeee715a 100644 --- a/CraftBukkit-Patches/0024-Adds-BUKKIT-3667-Faux-sleepers-wake-up-normally.patch +++ b/CraftBukkit-Patches/0025-Adds-BUKKIT-3667-Faux-sleepers-wake-up-normally.patch @@ -1,4 +1,4 @@ -From e22ea3833c0e389a95337ca3ece31fc2c86a1638 Mon Sep 17 00:00:00 2001 +From 7240644f227e09211adc0528dc79434d1496b80e Mon Sep 17 00:00:00 2001 From: Yariv Livay Date: Mon, 25 Feb 2013 22:26:36 +0200 Subject: [PATCH] Adds BUKKIT-3667, Faux sleepers wake up normally diff --git a/CraftBukkit-Patches/0025-PlayerItemDamageEvent.patch b/CraftBukkit-Patches/0026-PlayerItemDamageEvent.patch similarity index 97% rename from CraftBukkit-Patches/0025-PlayerItemDamageEvent.patch rename to CraftBukkit-Patches/0026-PlayerItemDamageEvent.patch index 1bf027e48b..c4b633133b 100644 --- a/CraftBukkit-Patches/0025-PlayerItemDamageEvent.patch +++ b/CraftBukkit-Patches/0026-PlayerItemDamageEvent.patch @@ -1,4 +1,4 @@ -From ef7bf26d03fd9935ed9c20fb92c4b7c914289c2b Mon Sep 17 00:00:00 2001 +From 587f66f4c3618911fb8b7f35fb8c0fa9faea2492 Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 4 Mar 2013 18:45:52 +1100 Subject: [PATCH] PlayerItemDamageEvent diff --git a/CraftBukkit-Patches/0026-Faster-UUID-for-entities.patch b/CraftBukkit-Patches/0027-Faster-UUID-for-entities.patch similarity index 93% rename from CraftBukkit-Patches/0026-Faster-UUID-for-entities.patch rename to CraftBukkit-Patches/0027-Faster-UUID-for-entities.patch index 8947354f2a..980a31ae7a 100644 --- a/CraftBukkit-Patches/0026-Faster-UUID-for-entities.patch +++ b/CraftBukkit-Patches/0027-Faster-UUID-for-entities.patch @@ -1,4 +1,4 @@ -From 2bfdd388dbc9e19dfc44ff035965f8a6c8dc9c44 Mon Sep 17 00:00:00 2001 +From bb5d2f99affb43f22ef7f16560ad6d6f7769fb33 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 17 Mar 2013 19:02:50 +1100 Subject: [PATCH] Faster UUID for entities diff --git a/CraftBukkit-Patches/0027-Prevent-NPE-in-CraftSign.patch b/CraftBukkit-Patches/0028-Prevent-NPE-in-CraftSign.patch similarity index 96% rename from CraftBukkit-Patches/0027-Prevent-NPE-in-CraftSign.patch rename to CraftBukkit-Patches/0028-Prevent-NPE-in-CraftSign.patch index 75146409ad..07b727b409 100644 --- a/CraftBukkit-Patches/0027-Prevent-NPE-in-CraftSign.patch +++ b/CraftBukkit-Patches/0028-Prevent-NPE-in-CraftSign.patch @@ -1,4 +1,4 @@ -From 197f9a0e30e92fa4ab306414b9e8b974b70e6041 Mon Sep 17 00:00:00 2001 +From 84eb369fce9dc020887e0a12a34cfcc4d60792ff Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 18 Mar 2013 20:01:44 +1100 Subject: [PATCH] Prevent NPE in CraftSign diff --git a/CraftBukkit-Patches/0028-Stage-DataWatcher-WatchableObject.patch b/CraftBukkit-Patches/0029-Stage-DataWatcher-WatchableObject.patch similarity index 99% rename from CraftBukkit-Patches/0028-Stage-DataWatcher-WatchableObject.patch rename to CraftBukkit-Patches/0029-Stage-DataWatcher-WatchableObject.patch index febdc48b94..01ebe012b1 100644 --- a/CraftBukkit-Patches/0028-Stage-DataWatcher-WatchableObject.patch +++ b/CraftBukkit-Patches/0029-Stage-DataWatcher-WatchableObject.patch @@ -1,4 +1,4 @@ -From 3b20c4c199e2c820818d87f31749077060e9e821 Mon Sep 17 00:00:00 2001 +From f42cdf26ec5cb3f6e2b779d1a528b4ee4c33b0e5 Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 21 Mar 2013 17:00:54 +1100 Subject: [PATCH] Stage DataWatcher & WatchableObject. diff --git a/CraftBukkit-Patches/0029-Entity-Tracking-Ranges.patch b/CraftBukkit-Patches/0030-Entity-Tracking-Ranges.patch similarity index 99% rename from CraftBukkit-Patches/0029-Entity-Tracking-Ranges.patch rename to CraftBukkit-Patches/0030-Entity-Tracking-Ranges.patch index 6c215555d7..e20fa2bd68 100644 --- a/CraftBukkit-Patches/0029-Entity-Tracking-Ranges.patch +++ b/CraftBukkit-Patches/0030-Entity-Tracking-Ranges.patch @@ -1,4 +1,4 @@ -From a954ac7cda5864b927a45fd250d9e4f13b496bf6 Mon Sep 17 00:00:00 2001 +From ec57dc372930d4f73afd8236067f957b072047c3 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 20 Feb 2013 11:58:47 -0500 Subject: [PATCH] Entity Tracking Ranges diff --git a/CraftBukkit-Patches/0030-BungeeCord-Support.patch b/CraftBukkit-Patches/0031-BungeeCord-Support.patch similarity index 98% rename from CraftBukkit-Patches/0030-BungeeCord-Support.patch rename to CraftBukkit-Patches/0031-BungeeCord-Support.patch index 62fd0cd23c..02f50b122c 100644 --- a/CraftBukkit-Patches/0030-BungeeCord-Support.patch +++ b/CraftBukkit-Patches/0031-BungeeCord-Support.patch @@ -1,4 +1,4 @@ -From df4dce8d4d2f09f2ce8645c6a10ccaaf6db57254 Mon Sep 17 00:00:00 2001 +From 27f6ceb7a4ed65d7d04d6be7efce9cbbf5188a65 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 afa0f04..e1db1be 100644 +index f25852e..b327310 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 { diff --git a/CraftBukkit-Patches/0031-Texture-Pack-Resolutions.patch b/CraftBukkit-Patches/0032-Texture-Pack-Resolutions.patch similarity index 97% rename from CraftBukkit-Patches/0031-Texture-Pack-Resolutions.patch rename to CraftBukkit-Patches/0032-Texture-Pack-Resolutions.patch index 1dc38d572c..227bcd1680 100644 --- a/CraftBukkit-Patches/0031-Texture-Pack-Resolutions.patch +++ b/CraftBukkit-Patches/0032-Texture-Pack-Resolutions.patch @@ -1,4 +1,4 @@ -From 6524a3b75751f2b723d6999a2ab08374b7409dbd Mon Sep 17 00:00:00 2001 +From bdcdd72dc9878325c316a5595fb7d1ef0224aea1 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 e1db1be..0e917e2 100644 +index b327310..b28f745 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 { diff --git a/CraftBukkit-Patches/0032-Limit-Custom-Map-Rendering.patch b/CraftBukkit-Patches/0033-Limit-Custom-Map-Rendering.patch similarity index 98% rename from CraftBukkit-Patches/0032-Limit-Custom-Map-Rendering.patch rename to CraftBukkit-Patches/0033-Limit-Custom-Map-Rendering.patch index a53da1c24f..ee2e6d1683 100644 --- a/CraftBukkit-Patches/0032-Limit-Custom-Map-Rendering.patch +++ b/CraftBukkit-Patches/0033-Limit-Custom-Map-Rendering.patch @@ -1,4 +1,4 @@ -From 6d8484689bc3524ca94f90821051cb5679c633f4 Mon Sep 17 00:00:00 2001 +From eaaa019cdcb5299aff6e559f8a994de977ffb6dc Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 23 Mar 2013 19:08:41 +1100 Subject: [PATCH] Limit Custom Map Rendering diff --git a/CraftBukkit-Patches/0033-Revert-Throw-exception-for-disabled-plugin-tasks.-Fi.patch b/CraftBukkit-Patches/0034-Revert-Throw-exception-for-disabled-plugin-tasks.-Fi.patch similarity index 95% rename from CraftBukkit-Patches/0033-Revert-Throw-exception-for-disabled-plugin-tasks.-Fi.patch rename to CraftBukkit-Patches/0034-Revert-Throw-exception-for-disabled-plugin-tasks.-Fi.patch index 0108d21c35..9f38ac4a45 100644 --- a/CraftBukkit-Patches/0033-Revert-Throw-exception-for-disabled-plugin-tasks.-Fi.patch +++ b/CraftBukkit-Patches/0034-Revert-Throw-exception-for-disabled-plugin-tasks.-Fi.patch @@ -1,4 +1,4 @@ -From 50181317d1a383df33e5ae9ddcde5fbe0fd8fcd0 Mon Sep 17 00:00:00 2001 +From b14eb452993c78acf37685b5c0a39cbc9fae836c Mon Sep 17 00:00:00 2001 From: Hudson Date: Wed, 3 Apr 2013 02:16:56 -0500 Subject: [PATCH] Revert "Throw exception for disabled plugin tasks. Fixes diff --git a/CraftBukkit-Patches/0034-InventoryClickEvent-now-can-return-if-the-click-was-.patch b/CraftBukkit-Patches/0035-InventoryClickEvent-now-can-return-if-the-click-was-.patch similarity index 97% rename from CraftBukkit-Patches/0034-InventoryClickEvent-now-can-return-if-the-click-was-.patch rename to CraftBukkit-Patches/0035-InventoryClickEvent-now-can-return-if-the-click-was-.patch index 0c56da9298..c7a10a4c15 100644 --- a/CraftBukkit-Patches/0034-InventoryClickEvent-now-can-return-if-the-click-was-.patch +++ b/CraftBukkit-Patches/0035-InventoryClickEvent-now-can-return-if-the-click-was-.patch @@ -1,4 +1,4 @@ -From 0aa4fb4c7cd3c73c1bbc8234cc21d677d9505233 Mon Sep 17 00:00:00 2001 +From 8ea1953b38cabdbc03f90d19d79c519f103b8de8 Mon Sep 17 00:00:00 2001 From: Tyler Blair Date: Tue, 9 Apr 2013 17:55:15 -0300 Subject: [PATCH] InventoryClickEvent now can return if the click was a double diff --git a/CraftBukkit-Patches/0035-Enable-Improved-ping-sending.patch b/CraftBukkit-Patches/0036-Enable-Improved-ping-sending.patch similarity index 97% rename from CraftBukkit-Patches/0035-Enable-Improved-ping-sending.patch rename to CraftBukkit-Patches/0036-Enable-Improved-ping-sending.patch index 89949a1bfe..f9d20c2c41 100644 --- a/CraftBukkit-Patches/0035-Enable-Improved-ping-sending.patch +++ b/CraftBukkit-Patches/0036-Enable-Improved-ping-sending.patch @@ -1,4 +1,4 @@ -From 5317680eeb4c666e77c17c152d8ae184890c42f4 Mon Sep 17 00:00:00 2001 +From 4204de932f4343febfd8d1b7e25edb9ccd6f8d10 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 24 Feb 2013 20:45:20 +1100 Subject: [PATCH] Enable Improved ping sending diff --git a/CraftBukkit-Patches/0036-Prevent-handshake-spam-from-invalid-names.patch b/CraftBukkit-Patches/0037-Prevent-handshake-spam-from-invalid-names.patch similarity index 97% rename from CraftBukkit-Patches/0036-Prevent-handshake-spam-from-invalid-names.patch rename to CraftBukkit-Patches/0037-Prevent-handshake-spam-from-invalid-names.patch index 9401463b9d..f7a1e6a5d2 100644 --- a/CraftBukkit-Patches/0036-Prevent-handshake-spam-from-invalid-names.patch +++ b/CraftBukkit-Patches/0037-Prevent-handshake-spam-from-invalid-names.patch @@ -1,4 +1,4 @@ -From 02595714633a1628bbccf8ee69e8fb4cb42ec2aa Mon Sep 17 00:00:00 2001 +From 027ce59bdca943351a403d8bec0e6397db887175 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. diff --git a/CraftBukkit-Patches/0037-Save-entity-counts-for-randomly-spawned-creatures-to.patch b/CraftBukkit-Patches/0038-Save-entity-counts-for-randomly-spawned-creatures-to.patch similarity index 97% rename from CraftBukkit-Patches/0037-Save-entity-counts-for-randomly-spawned-creatures-to.patch rename to CraftBukkit-Patches/0038-Save-entity-counts-for-randomly-spawned-creatures-to.patch index 9039cdf72f..97a365851e 100644 --- a/CraftBukkit-Patches/0037-Save-entity-counts-for-randomly-spawned-creatures-to.patch +++ b/CraftBukkit-Patches/0038-Save-entity-counts-for-randomly-spawned-creatures-to.patch @@ -1,4 +1,4 @@ -From deaa953a5963c36f4bda603411fa6905e390869e Mon Sep 17 00:00:00 2001 +From b5e5145a64d772c22a4b0967dfdd31bec35e3f95 Mon Sep 17 00:00:00 2001 From: Ammar Askar Date: Sat, 20 Apr 2013 12:26:20 +0500 Subject: [PATCH] Save entity counts for randomly spawned creatures to avoid diff --git a/CraftBukkit-Patches/0038-Thread-Naming-and-Tweaks.patch b/CraftBukkit-Patches/0039-Thread-Naming-and-Tweaks.patch similarity index 97% rename from CraftBukkit-Patches/0038-Thread-Naming-and-Tweaks.patch rename to CraftBukkit-Patches/0039-Thread-Naming-and-Tweaks.patch index 05b03a460b..a382c7fa23 100644 --- a/CraftBukkit-Patches/0038-Thread-Naming-and-Tweaks.patch +++ b/CraftBukkit-Patches/0039-Thread-Naming-and-Tweaks.patch @@ -1,4 +1,4 @@ -From 357aaae4276ecb50801aa79a62049399d9f160c7 Mon Sep 17 00:00:00 2001 +From 7ee0a66502aeb629a002b346fcd7c4cfb2de0257 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 23 Apr 2013 11:50:27 +1000 Subject: [PATCH] Thread Naming and Tweaks @@ -6,7 +6,7 @@ Subject: [PATCH] Thread Naming and Tweaks Removes the sleep forever thread and adds useful names for debugging to all staged thread files. diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index 097be65..f37c784 100644 +index e4f1cbe..048196e 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -34,7 +34,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer diff --git a/CraftBukkit-Patches/0039-Fixes-BUKKIT-3893-Close-world-save-files-when-world-.patch b/CraftBukkit-Patches/0040-Fixes-BUKKIT-3893-Close-world-save-files-when-world-.patch similarity index 97% rename from CraftBukkit-Patches/0039-Fixes-BUKKIT-3893-Close-world-save-files-when-world-.patch rename to CraftBukkit-Patches/0040-Fixes-BUKKIT-3893-Close-world-save-files-when-world-.patch index a914f648fd..d95e1edf3a 100644 --- a/CraftBukkit-Patches/0039-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 eba4a4425c443769e26a64640532f43d2bee04cc Mon Sep 17 00:00:00 2001 +From 0f9b140ce9f9ffde372ff7b9eec431bb71861e69 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 diff --git a/CraftBukkit-Patches/0040-Optimized-version-of-LocaleLanguage.patch b/CraftBukkit-Patches/0041-Optimized-version-of-LocaleLanguage.patch similarity index 98% rename from CraftBukkit-Patches/0040-Optimized-version-of-LocaleLanguage.patch rename to CraftBukkit-Patches/0041-Optimized-version-of-LocaleLanguage.patch index adf23c1880..d6c805af81 100644 --- a/CraftBukkit-Patches/0040-Optimized-version-of-LocaleLanguage.patch +++ b/CraftBukkit-Patches/0041-Optimized-version-of-LocaleLanguage.patch @@ -1,4 +1,4 @@ -From 14cfdef4dcf4444bb77a94f927077588e4a58bd5 Mon Sep 17 00:00:00 2001 +From 7fc33371f89d29558ce22c66fcec47e6b1b13038 Mon Sep 17 00:00:00 2001 From: snowleo Date: Wed, 8 May 2013 12:09:45 +1000 Subject: [PATCH] Optimized version of LocaleLanguage diff --git a/CraftBukkit-Patches/0041-Improve-next-tick-list-performance-on-chunk-unloads-.patch b/CraftBukkit-Patches/0042-Improve-next-tick-list-performance-on-chunk-unloads-.patch similarity index 99% rename from CraftBukkit-Patches/0041-Improve-next-tick-list-performance-on-chunk-unloads-.patch rename to CraftBukkit-Patches/0042-Improve-next-tick-list-performance-on-chunk-unloads-.patch index 40bdc21dfe..9543f844a3 100644 --- a/CraftBukkit-Patches/0041-Improve-next-tick-list-performance-on-chunk-unloads-.patch +++ b/CraftBukkit-Patches/0042-Improve-next-tick-list-performance-on-chunk-unloads-.patch @@ -1,4 +1,4 @@ -From 5cca431dbcda5512e12ccb887ae8e8e741c57b18 Mon Sep 17 00:00:00 2001 +From 6db12ad6017b2f85d480e1f3609a269573a65adc Mon Sep 17 00:00:00 2001 From: Mike Primm Date: Wed, 24 Apr 2013 01:43:33 -0500 Subject: [PATCH] Improve next-tick-list performance on chunk unloads, large @@ -308,5 +308,5 @@ index a2f7fee..b0c2c96 100644 + // Spigot end } -- -1.8.1.3 +1.8.2.1