diff --git a/CraftBukkit-Patches/0005-Spigot-Changes.patch b/CraftBukkit-Patches/0005-Spigot-Changes.patch index 4db77b9279..86a380f10f 100644 --- a/CraftBukkit-Patches/0005-Spigot-Changes.patch +++ b/CraftBukkit-Patches/0005-Spigot-Changes.patch @@ -1,6 +1,6 @@ -From 82614bb009f47f71c81667af3e86f460d60cf5f7 Mon Sep 17 00:00:00 2001 +From 9689ef70b5f735de03b42766e0d8bef5cb5817a6 Mon Sep 17 00:00:00 2001 From: md_5 -Date: Tue, 11 Jun 2013 11:53:13 +1000 +Date: Tue, 11 Jun 2013 12:02:53 +1000 Subject: [PATCH] Spigot Changes @@ -142,102 +142,6 @@ index 8339a35..c17ce36 100644 int l = world.getData(i, j, k); if (l < 7) { -diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java -index bee715b..9643480 100644 ---- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java -+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java -@@ -13,8 +13,7 @@ import java.util.Set; - - public class ChunkRegionLoader implements IAsyncChunkSaver, IChunkLoader { - -- private List a = new ArrayList(); -- private Set b = new HashSet(); -+ private java.util.LinkedHashMap pendingSaves = new java.util.LinkedHashMap(); // Spigot - private Object c = new Object(); - private final File d; - -@@ -27,15 +26,12 @@ public class ChunkRegionLoader implements IAsyncChunkSaver, IChunkLoader { - ChunkCoordIntPair chunkcoordintpair = new ChunkCoordIntPair(i, j); - - synchronized (this.c) { -- if (this.b.contains(chunkcoordintpair)) { -- for (int k = 0; k < this.a.size(); ++k) { -- if (((PendingChunkToSave) this.a.get(k)).a.equals(chunkcoordintpair)) { -- return true; -- } -- } -+ // Spigot start -+ if (pendingSaves.containsKey(chunkcoordintpair)) { -+ return true; - } - } -- -+ // Spigot end - return RegionFileCache.a(this.d, i, j).chunkExists(i & 31, j & 31); - } - // CraftBukkit end -@@ -60,6 +56,12 @@ public class ChunkRegionLoader implements IAsyncChunkSaver, IChunkLoader { - Object object = this.c; - - synchronized (this.c) { -+ // Spigot start -+ PendingChunkToSave pendingchunktosave = pendingSaves.get(chunkcoordintpair); -+ if (pendingchunktosave != null) { -+ nbttagcompound = pendingchunktosave.b; -+ } -+ /* - if (this.b.contains(chunkcoordintpair)) { - for (int k = 0; k < this.a.size(); ++k) { - if (((PendingChunkToSave) this.a.get(k)).a.equals(chunkcoordintpair)) { -@@ -68,6 +70,7 @@ public class ChunkRegionLoader implements IAsyncChunkSaver, IChunkLoader { - } - } - } -+ */// Spigot end - } - - if (nbttagcompound == null) { -@@ -148,6 +151,11 @@ public class ChunkRegionLoader implements IAsyncChunkSaver, IChunkLoader { - Object object = this.c; - - synchronized (this.c) { -+ // Spigot start -+ if (this.pendingSaves.put(chunkcoordintpair, new PendingChunkToSave(chunkcoordintpair, nbttagcompound)) != null) { -+ return; -+ } -+ /* - if (this.b.contains(chunkcoordintpair)) { - for (int i = 0; i < this.a.size(); ++i) { - if (((PendingChunkToSave) this.a.get(i)).a.equals(chunkcoordintpair)) { -@@ -159,6 +167,7 @@ public class ChunkRegionLoader implements IAsyncChunkSaver, IChunkLoader { - - this.a.add(new PendingChunkToSave(chunkcoordintpair, nbttagcompound)); - this.b.add(chunkcoordintpair); -+ */// Spigot end - FileIOThread.a.a(this); - } - } -@@ -168,12 +177,20 @@ public class ChunkRegionLoader implements IAsyncChunkSaver, IChunkLoader { - Object object = this.c; - - synchronized (this.c) { -+ // Spigot start -+ if (this.pendingSaves.isEmpty()) { -+ return false; -+ } -+ pendingchunktosave = this.pendingSaves.values().iterator().next(); -+ this.pendingSaves.remove(pendingchunktosave.a); -+ /* - if (this.a.isEmpty()) { - return false; - } - - pendingchunktosave = (PendingChunkToSave) this.a.remove(0); - this.b.remove(pendingchunktosave.a); -+ */// Spigot end - } - - if (pendingchunktosave != null) { diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java index f1c2d48..e1872cc 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java @@ -812,10 +716,10 @@ index c896ba2..e99cb22 100644 } diff --git a/src/main/resources/configurations/bukkit.yml b/src/main/resources/configurations/bukkit.yml -index 61a95e3..f2ce75e 100644 +index 61a95e3..67c6c5e 100644 --- a/src/main/resources/configurations/bukkit.yml +++ b/src/main/resources/configurations/bukkit.yml -@@ -25,6 +25,31 @@ settings: +@@ -25,6 +25,30 @@ settings: query-plugins: true deprecated-verbose: default shutdown-message: Server closed @@ -843,7 +747,6 @@ index 61a95e3..f2ce75e 100644 + world_nether: + growth-chunks-per-tick: 0 + random-light-updates: true -+ water-creatures-per-chunk: 0 spawn-limits: monsters: 70 animals: 15 diff --git a/CraftBukkit-Patches/0006-More-Efficient-Chunk-Save-Queue.patch b/CraftBukkit-Patches/0006-More-Efficient-Chunk-Save-Queue.patch new file mode 100644 index 0000000000..6dc197fa59 --- /dev/null +++ b/CraftBukkit-Patches/0006-More-Efficient-Chunk-Save-Queue.patch @@ -0,0 +1,106 @@ +From e0342635c30572cde8156362401c52c42693f114 Mon Sep 17 00:00:00 2001 +From: md_5 +Date: Tue, 11 Jun 2013 12:09:45 +1000 +Subject: [PATCH] More Efficient Chunk Save Queue + + +diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java +index bee715b..62ec7d6 100644 +--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java ++++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java +@@ -13,8 +13,11 @@ import java.util.Set; + + public class ChunkRegionLoader implements IAsyncChunkSaver, IChunkLoader { + +- private List a = new ArrayList(); +- private Set b = new HashSet(); ++ // Spigot start ++ private java.util.LinkedHashMap pendingSaves = new java.util.LinkedHashMap(); ++ // private List a = new ArrayList(); ++ // private Set b = new HashSet(); ++ // Spigot end + private Object c = new Object(); + private final File d; + +@@ -27,13 +30,11 @@ public class ChunkRegionLoader implements IAsyncChunkSaver, IChunkLoader { + ChunkCoordIntPair chunkcoordintpair = new ChunkCoordIntPair(i, j); + + synchronized (this.c) { +- if (this.b.contains(chunkcoordintpair)) { +- for (int k = 0; k < this.a.size(); ++k) { +- if (((PendingChunkToSave) this.a.get(k)).a.equals(chunkcoordintpair)) { +- return true; +- } +- } +- } ++ // Spigot start ++ if (pendingSaves.containsKey(chunkcoordintpair)) { ++ return true; ++ } ++ // Spigot end + } + + return RegionFileCache.a(this.d, i, j).chunkExists(i & 31, j & 31); +@@ -60,14 +61,12 @@ public class ChunkRegionLoader implements IAsyncChunkSaver, IChunkLoader { + Object object = this.c; + + synchronized (this.c) { +- if (this.b.contains(chunkcoordintpair)) { +- for (int k = 0; k < this.a.size(); ++k) { +- if (((PendingChunkToSave) this.a.get(k)).a.equals(chunkcoordintpair)) { +- nbttagcompound = ((PendingChunkToSave) this.a.get(k)).b; +- break; +- } +- } ++ // Spigot start ++ PendingChunkToSave pendingchunktosave = pendingSaves.get(chunkcoordintpair); ++ if (pendingchunktosave != null) { ++ nbttagcompound = pendingchunktosave.b; + } ++ // Spigot end + } + + if (nbttagcompound == null) { +@@ -148,17 +147,11 @@ public class ChunkRegionLoader implements IAsyncChunkSaver, IChunkLoader { + Object object = this.c; + + synchronized (this.c) { +- if (this.b.contains(chunkcoordintpair)) { +- for (int i = 0; i < this.a.size(); ++i) { +- if (((PendingChunkToSave) this.a.get(i)).a.equals(chunkcoordintpair)) { +- this.a.set(i, new PendingChunkToSave(chunkcoordintpair, nbttagcompound)); +- return; +- } +- } ++ // Spigot start ++ if (this.pendingSaves.put(chunkcoordintpair, new PendingChunkToSave(chunkcoordintpair, nbttagcompound)) != null) { ++ return; + } +- +- this.a.add(new PendingChunkToSave(chunkcoordintpair, nbttagcompound)); +- this.b.add(chunkcoordintpair); ++ // Spigot end + FileIOThread.a.a(this); + } + } +@@ -168,12 +161,14 @@ public class ChunkRegionLoader implements IAsyncChunkSaver, IChunkLoader { + Object object = this.c; + + synchronized (this.c) { +- if (this.a.isEmpty()) { ++ // Spigot start ++ if (this.pendingSaves.isEmpty()) { + return false; + } + +- pendingchunktosave = (PendingChunkToSave) this.a.remove(0); +- this.b.remove(pendingchunktosave.a); ++ pendingchunktosave = this.pendingSaves.values().iterator().next(); ++ this.pendingSaves.remove(pendingchunktosave.a); ++ // Spigot end + } + + if (pendingchunktosave != null) { +-- +1.8.1.2 + diff --git a/CraftBukkit-Patches/0006-Proxy-IP-Filter.patch b/CraftBukkit-Patches/0007-Proxy-IP-Filter.patch similarity index 97% rename from CraftBukkit-Patches/0006-Proxy-IP-Filter.patch rename to CraftBukkit-Patches/0007-Proxy-IP-Filter.patch index 3f24dddb1a..ad46060c68 100644 --- a/CraftBukkit-Patches/0006-Proxy-IP-Filter.patch +++ b/CraftBukkit-Patches/0007-Proxy-IP-Filter.patch @@ -1,4 +1,4 @@ -From c1f139d1b8556e177e82a4af5427668e932bacb1 Mon Sep 17 00:00:00 2001 +From bca3a10c78e0bbf4943a727b482b9780acf82543 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 23 Apr 2013 11:22:07 +1000 Subject: [PATCH] Proxy IP Filter @@ -71,7 +71,7 @@ index 2cd806e..fd90979 100644 + } } diff --git a/src/main/resources/configurations/bukkit.yml b/src/main/resources/configurations/bukkit.yml -index f2ce75e..b7c0376 100644 +index 67c6c5e..b445808 100644 --- a/src/main/resources/configurations/bukkit.yml +++ b/src/main/resources/configurations/bukkit.yml @@ -30,6 +30,7 @@ settings: diff --git a/CraftBukkit-Patches/0007-Merge-tweaks-and-configuration.patch b/CraftBukkit-Patches/0008-Merge-tweaks-and-configuration.patch similarity index 98% rename from CraftBukkit-Patches/0007-Merge-tweaks-and-configuration.patch rename to CraftBukkit-Patches/0008-Merge-tweaks-and-configuration.patch index 7722bbb369..1bcfeb88dc 100644 --- a/CraftBukkit-Patches/0007-Merge-tweaks-and-configuration.patch +++ b/CraftBukkit-Patches/0008-Merge-tweaks-and-configuration.patch @@ -1,4 +1,4 @@ -From e06797e10a91fd0b1e19b9dee8b4eed064f7ad1f Mon Sep 17 00:00:00 2001 +From 015476de434588438036e786082d4030c30f3d90 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 @@ -69,7 +69,7 @@ index 70dd295..b339688 100644 if (event != null && (event.isCancelled() || entity.dead)) { entity.dead = true; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 63e8e69..68fd274 100644 +index 8958643..16946da 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -92,6 +92,8 @@ public class CraftWorld implements World { @@ -100,7 +100,7 @@ index 63e8e69..68fd274 100644 public int wheatGrowthModifier = 100; public int cactusGrowthModifier = 100; diff --git a/src/main/resources/configurations/bukkit.yml b/src/main/resources/configurations/bukkit.yml -index b7c0376..92241d9 100644 +index b445808..56873b6 100644 --- a/src/main/resources/configurations/bukkit.yml +++ b/src/main/resources/configurations/bukkit.yml @@ -37,6 +37,8 @@ world-settings: diff --git a/CraftBukkit-Patches/0008-LongHash-Tweaks.patch b/CraftBukkit-Patches/0009-LongHash-Tweaks.patch similarity index 98% rename from CraftBukkit-Patches/0008-LongHash-Tweaks.patch rename to CraftBukkit-Patches/0009-LongHash-Tweaks.patch index 831fb6de29..4b121657d8 100644 --- a/CraftBukkit-Patches/0008-LongHash-Tweaks.patch +++ b/CraftBukkit-Patches/0009-LongHash-Tweaks.patch @@ -1,4 +1,4 @@ -From 2ecfad78b61cb4387b95bea5fced24674f11c5c2 Mon Sep 17 00:00:00 2001 +From b8419eef06b01e0f460101018d8e98987a3244ba 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/0009-Async-Operation-Catching.patch b/CraftBukkit-Patches/0010-Async-Operation-Catching.patch similarity index 98% rename from CraftBukkit-Patches/0009-Async-Operation-Catching.patch rename to CraftBukkit-Patches/0010-Async-Operation-Catching.patch index e69958255c..4e8e6c30d8 100644 --- a/CraftBukkit-Patches/0009-Async-Operation-Catching.patch +++ b/CraftBukkit-Patches/0010-Async-Operation-Catching.patch @@ -1,4 +1,4 @@ -From e3937541b59ed0f9e22ae526fc5a80472bc61c92 Mon Sep 17 00:00:00 2001 +From 9986fbb95bd13747885d26465c11b89b384e7f1f Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 7 Mar 2013 20:12:46 +1100 Subject: [PATCH] Async Operation Catching @@ -74,7 +74,7 @@ index b339688..3f9c453 100644 Entity entity = null; for (int i = 0; i < list.size(); ++i) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 68fd274..9e7d8ab 100644 +index 16946da..e372520 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -235,6 +235,7 @@ public class CraftWorld implements World { @@ -102,7 +102,7 @@ index 68fd274..9e7d8ab 100644 if (generate) { // Use the default variant of loadChunk when generate == true. diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 8c30bf5..13532d9 100644 +index df07a9b..7cae665 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -214,6 +214,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/CraftBukkit-Patches/0010-View-Distance.patch b/CraftBukkit-Patches/0011-View-Distance.patch similarity index 95% rename from CraftBukkit-Patches/0010-View-Distance.patch rename to CraftBukkit-Patches/0011-View-Distance.patch index 04744fa5f5..97f42ab953 100644 --- a/CraftBukkit-Patches/0010-View-Distance.patch +++ b/CraftBukkit-Patches/0011-View-Distance.patch @@ -1,4 +1,4 @@ -From 615788f930d232e0babb5dea4e2ba858e51e0cfb Mon Sep 17 00:00:00 2001 +From 2790bf62ff1f776411ca362ebc41ab0571f63bc8 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 23 Mar 2013 09:52:41 +1100 Subject: [PATCH] View Distance @@ -32,7 +32,7 @@ index 8114910..3a321da 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 9e7d8ab..44d1842 100644 +index e372520..0c7ff1a 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 { @@ -62,7 +62,7 @@ index 9e7d8ab..44d1842 100644 public int wheatGrowthModifier = 100; public int cactusGrowthModifier = 100; diff --git a/src/main/resources/configurations/bukkit.yml b/src/main/resources/configurations/bukkit.yml -index 92241d9..10ef7f2 100644 +index 56873b6..fe257e2 100644 --- a/src/main/resources/configurations/bukkit.yml +++ b/src/main/resources/configurations/bukkit.yml @@ -50,6 +50,7 @@ world-settings: @@ -72,7 +72,7 @@ index 92241d9..10ef7f2 100644 + view-distance: 5 growth-chunks-per-tick: 0 random-light-updates: true - water-creatures-per-chunk: 0 + spawn-limits: -- 1.8.1.2 diff --git a/CraftBukkit-Patches/0011-Implement-lightening-of-NibbleArrays-only-allocate-b.patch b/CraftBukkit-Patches/0012-Implement-lightening-of-NibbleArrays-only-allocate-b.patch similarity index 99% rename from CraftBukkit-Patches/0011-Implement-lightening-of-NibbleArrays-only-allocate-b.patch rename to CraftBukkit-Patches/0012-Implement-lightening-of-NibbleArrays-only-allocate-b.patch index 334f7d57b4..9d22a16af3 100644 --- a/CraftBukkit-Patches/0011-Implement-lightening-of-NibbleArrays-only-allocate-b.patch +++ b/CraftBukkit-Patches/0012-Implement-lightening-of-NibbleArrays-only-allocate-b.patch @@ -1,4 +1,4 @@ -From 0158463f8c0e7099b9bebe51973af84f6f0e3455 Mon Sep 17 00:00:00 2001 +From 5b52dd4d9234729246f5e9fbfe4b78046e060a2b 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 @@ -10,10 +10,10 @@ Finish up NibbleArray lightening work - use for Snapshots, reduce copies Fix nibble handling with NBT - arrays aren't copied by NBTByteArray diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java -index 9643480..364776f 100644 +index 62ec7d6..a90209e 100644 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java -@@ -243,15 +243,15 @@ public class ChunkRegionLoader implements IAsyncChunkSaver, IChunkLoader { +@@ -221,15 +221,15 @@ public class ChunkRegionLoader implements IAsyncChunkSaver, IChunkLoader { nbttagcompound1.setByte("Y", (byte) (chunksection.getYPosition() >> 4 & 255)); nbttagcompound1.setByteArray("Blocks", chunksection.getIdArray()); if (chunksection.getExtendedIdArray() != null) { diff --git a/CraftBukkit-Patches/0012-Optimize-packet-used-to-unload-chunks-for-the-client.patch b/CraftBukkit-Patches/0013-Optimize-packet-used-to-unload-chunks-for-the-client.patch similarity index 97% rename from CraftBukkit-Patches/0012-Optimize-packet-used-to-unload-chunks-for-the-client.patch rename to CraftBukkit-Patches/0013-Optimize-packet-used-to-unload-chunks-for-the-client.patch index 6064e3bbeb..d5b4126190 100644 --- a/CraftBukkit-Patches/0012-Optimize-packet-used-to-unload-chunks-for-the-client.patch +++ b/CraftBukkit-Patches/0013-Optimize-packet-used-to-unload-chunks-for-the-client.patch @@ -1,4 +1,4 @@ -From 3cd5b8537185c13f0dbc8960f9b13704f9b7ac61 Mon Sep 17 00:00:00 2001 +From 6a9c5c82ee74a851a036278c077b067150d9da43 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 diff --git a/CraftBukkit-Patches/0013-Alternate-sync-free-but-safe-chunk-reference-cache.patch b/CraftBukkit-Patches/0014-Alternate-sync-free-but-safe-chunk-reference-cache.patch similarity index 95% rename from CraftBukkit-Patches/0013-Alternate-sync-free-but-safe-chunk-reference-cache.patch rename to CraftBukkit-Patches/0014-Alternate-sync-free-but-safe-chunk-reference-cache.patch index 84685f2ed0..2c58e6d376 100644 --- a/CraftBukkit-Patches/0013-Alternate-sync-free-but-safe-chunk-reference-cache.patch +++ b/CraftBukkit-Patches/0014-Alternate-sync-free-but-safe-chunk-reference-cache.patch @@ -1,4 +1,4 @@ -From efc966adb6c138f68d65b428b3418a7e9b60b598 Mon Sep 17 00:00:00 2001 +From e0a6170dda0a8044bc1dd3f8e71f92d6dfcb078c 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/CraftBukkit-Patches/0014-Tick-loop-optimization-sleep-for-as-long-as-possible.patch b/CraftBukkit-Patches/0015-Tick-loop-optimization-sleep-for-as-long-as-possible.patch similarity index 98% rename from CraftBukkit-Patches/0014-Tick-loop-optimization-sleep-for-as-long-as-possible.patch rename to CraftBukkit-Patches/0015-Tick-loop-optimization-sleep-for-as-long-as-possible.patch index 1da492690e..4838b3934f 100644 --- a/CraftBukkit-Patches/0014-Tick-loop-optimization-sleep-for-as-long-as-possible.patch +++ b/CraftBukkit-Patches/0015-Tick-loop-optimization-sleep-for-as-long-as-possible.patch @@ -1,4 +1,4 @@ -From e6b7404237e2092f4fcd6d298f3418a7c35d61e5 Mon Sep 17 00:00:00 2001 +From 832dcaab6f83bf7cae55da87e718a77e04a4b211 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/0015-Improved-Timings-System.patch b/CraftBukkit-Patches/0016-Improved-Timings-System.patch similarity index 99% rename from CraftBukkit-Patches/0015-Improved-Timings-System.patch rename to CraftBukkit-Patches/0016-Improved-Timings-System.patch index d24f8716c8..eb77a25bd3 100644 --- a/CraftBukkit-Patches/0015-Improved-Timings-System.patch +++ b/CraftBukkit-Patches/0016-Improved-Timings-System.patch @@ -1,4 +1,4 @@ -From ccace5cb2e3762d56d5533ac32427abecc381d6c Mon Sep 17 00:00:00 2001 +From 3dfc8bdf20e23a8f70642101989912cc11ff1be7 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 10 Jan 2013 00:18:11 -0500 Subject: [PATCH] Improved Timings System @@ -213,7 +213,7 @@ index 3c80340..db396b3 100644 this.methodProfiler.b(); } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 1697b18..a2b63c1 100644 +index e1872cc..cf36aba 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -968,6 +968,7 @@ public class PlayerConnection extends Connection { diff --git a/CraftBukkit-Patches/0016-Orebfuscator.patch b/CraftBukkit-Patches/0017-Orebfuscator.patch similarity index 99% rename from CraftBukkit-Patches/0016-Orebfuscator.patch rename to CraftBukkit-Patches/0017-Orebfuscator.patch index 499636b90a..9794dc3883 100644 --- a/CraftBukkit-Patches/0016-Orebfuscator.patch +++ b/CraftBukkit-Patches/0017-Orebfuscator.patch @@ -1,4 +1,4 @@ -From 58a55e37c1bd0b0d4c0d3fccfa57e1a016b3cb0e Mon Sep 17 00:00:00 2001 +From d1fcdee476dc06ec97df4aa445aec79a4de1b486 Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 16 May 2013 18:51:05 +1000 Subject: [PATCH] Orebfuscator @@ -382,10 +382,10 @@ index 0000000..aa1ddfc + } +} diff --git a/src/main/resources/configurations/bukkit.yml b/src/main/resources/configurations/bukkit.yml -index 10ef7f2..e08325d 100644 +index fe257e2..7860ccc 100644 --- a/src/main/resources/configurations/bukkit.yml +++ b/src/main/resources/configurations/bukkit.yml -@@ -82,3 +82,9 @@ database: +@@ -81,3 +81,9 @@ database: driver: org.sqlite.JDBC password: walrus url: jdbc:sqlite:{DIR}{NAME}.db diff --git a/CraftBukkit-Patches/0017-Only-count-entities-in-chunks-being-processed-for-th.patch b/CraftBukkit-Patches/0018-Only-count-entities-in-chunks-being-processed-for-th.patch similarity index 98% rename from CraftBukkit-Patches/0017-Only-count-entities-in-chunks-being-processed-for-th.patch rename to CraftBukkit-Patches/0018-Only-count-entities-in-chunks-being-processed-for-th.patch index 1acba4b5a8..b5548b90ad 100644 --- a/CraftBukkit-Patches/0017-Only-count-entities-in-chunks-being-processed-for-th.patch +++ b/CraftBukkit-Patches/0018-Only-count-entities-in-chunks-being-processed-for-th.patch @@ -1,4 +1,4 @@ -From e81d7a679a63107fd894beb6e11b9006afe4fb80 Mon Sep 17 00:00:00 2001 +From 7adf7bd860703f2cbe8967b945524ac3cba19791 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 diff --git a/CraftBukkit-Patches/0018-Detect-remove-and-warn-about-null-tile-entities.patch b/CraftBukkit-Patches/0019-Detect-remove-and-warn-about-null-tile-entities.patch similarity index 94% rename from CraftBukkit-Patches/0018-Detect-remove-and-warn-about-null-tile-entities.patch rename to CraftBukkit-Patches/0019-Detect-remove-and-warn-about-null-tile-entities.patch index ed9dfd9e0b..7f218d4d64 100644 --- a/CraftBukkit-Patches/0018-Detect-remove-and-warn-about-null-tile-entities.patch +++ b/CraftBukkit-Patches/0019-Detect-remove-and-warn-about-null-tile-entities.patch @@ -1,4 +1,4 @@ -From 1fc9f7e78ef68f03e1c3d8f052d038987ee0de98 Mon Sep 17 00:00:00 2001 +From 87d0081d8e90fbc40cba4e35318a5102c55b8c55 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/CraftBukkit-Patches/0019-Entity-Activation-Range.patch b/CraftBukkit-Patches/0020-Entity-Activation-Range.patch similarity index 99% rename from CraftBukkit-Patches/0019-Entity-Activation-Range.patch rename to CraftBukkit-Patches/0020-Entity-Activation-Range.patch index 7e90e68048..6bd3be2c8b 100644 --- a/CraftBukkit-Patches/0019-Entity-Activation-Range.patch +++ b/CraftBukkit-Patches/0020-Entity-Activation-Range.patch @@ -1,4 +1,4 @@ -From 5d78668da09b68fc181c05bfc3873d6c52d096a7 Mon Sep 17 00:00:00 2001 +From 06b281d89b82328a5cfd0296df327f2a0b580aff Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 3 Feb 2013 05:10:21 -0500 Subject: [PATCH] Entity Activation Range @@ -498,7 +498,7 @@ index f6e507e..4328ecf 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 e08325d..96d26d4 100644 +index 7860ccc..9c64871 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/0020-Metrics.-Rewrite-the-Metrics-system-to-be-closer-to-.patch b/CraftBukkit-Patches/0021-Metrics.-Rewrite-the-Metrics-system-to-be-closer-to-.patch similarity index 99% rename from CraftBukkit-Patches/0020-Metrics.-Rewrite-the-Metrics-system-to-be-closer-to-.patch rename to CraftBukkit-Patches/0021-Metrics.-Rewrite-the-Metrics-system-to-be-closer-to-.patch index 9de22c8cd9..b23c44befc 100644 --- a/CraftBukkit-Patches/0020-Metrics.-Rewrite-the-Metrics-system-to-be-closer-to-.patch +++ b/CraftBukkit-Patches/0021-Metrics.-Rewrite-the-Metrics-system-to-be-closer-to-.patch @@ -1,4 +1,4 @@ -From 21a14e48fded76d3ef5510e1ce9f68044e1a4c16 Mon Sep 17 00:00:00 2001 +From 9839d0e5d738d17736f9e839e034999686cf760d 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 e89c3a5..4b222a3 100644 +index 2fc33f8..2532aa2 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/0021-Watchdog-Thread.patch b/CraftBukkit-Patches/0022-Watchdog-Thread.patch similarity index 99% rename from CraftBukkit-Patches/0021-Watchdog-Thread.patch rename to CraftBukkit-Patches/0022-Watchdog-Thread.patch index 40a875a933..a2fac09b90 100644 --- a/CraftBukkit-Patches/0021-Watchdog-Thread.patch +++ b/CraftBukkit-Patches/0022-Watchdog-Thread.patch @@ -1,4 +1,4 @@ -From 71385796935c0381e4242da0871d286763302075 Mon Sep 17 00:00:00 2001 +From 98eafd828ed35776a1ae6ecce1d2e2136f271a34 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 23 Feb 2013 12:33:20 +1100 Subject: [PATCH] Watchdog Thread. @@ -281,7 +281,7 @@ index 0000000..10390b8 + } +} diff --git a/src/main/resources/configurations/bukkit.yml b/src/main/resources/configurations/bukkit.yml -index 96d26d4..67b4fa9 100644 +index 9c64871..3d4272b 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/0022-Netty.patch b/CraftBukkit-Patches/0023-Netty.patch similarity index 99% rename from CraftBukkit-Patches/0022-Netty.patch rename to CraftBukkit-Patches/0023-Netty.patch index d52164d55e..3fa39b056d 100644 --- a/CraftBukkit-Patches/0022-Netty.patch +++ b/CraftBukkit-Patches/0023-Netty.patch @@ -1,4 +1,4 @@ -From 116660b99d312b4d84956541a7fbc351778d4365 Mon Sep 17 00:00:00 2001 +From b5ea7a6e42e62e6f49373f9b90efaf05d96d791c Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 23 Apr 2013 11:47:32 +1000 Subject: [PATCH] Netty @@ -1503,7 +1503,7 @@ index 0000000..d3a9cab + DATA; +} diff --git a/src/main/resources/configurations/bukkit.yml b/src/main/resources/configurations/bukkit.yml -index 67b4fa9..d26e644 100644 +index 3d4272b..53db120 100644 --- a/src/main/resources/configurations/bukkit.yml +++ b/src/main/resources/configurations/bukkit.yml @@ -13,6 +13,9 @@ diff --git a/CraftBukkit-Patches/0023-Return-bed-location-itself-instead-of-next-to-bed-Fi.patch b/CraftBukkit-Patches/0024-Return-bed-location-itself-instead-of-next-to-bed-Fi.patch similarity index 94% rename from CraftBukkit-Patches/0023-Return-bed-location-itself-instead-of-next-to-bed-Fi.patch rename to CraftBukkit-Patches/0024-Return-bed-location-itself-instead-of-next-to-bed-Fi.patch index 61dfbf6fdc..f945207bba 100644 --- a/CraftBukkit-Patches/0023-Return-bed-location-itself-instead-of-next-to-bed-Fi.patch +++ b/CraftBukkit-Patches/0024-Return-bed-location-itself-instead-of-next-to-bed-Fi.patch @@ -1,4 +1,4 @@ -From cae89b15483e8f9e69420c90ad470e7e25e836b6 Mon Sep 17 00:00:00 2001 +From 8d19c5f1c4232cd0857ec9277e601b41000c9915 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 @@ -6,7 +6,7 @@ Subject: [PATCH] Return bed location itself instead of next to bed; Fixes diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 13532d9..0b5ea21 100644 +index 7cae665..8ec84e1 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -628,10 +628,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/CraftBukkit-Patches/0024-Remove-dependency-on-CraftPlayer.getBedSpawnLocation.patch b/CraftBukkit-Patches/0025-Remove-dependency-on-CraftPlayer.getBedSpawnLocation.patch similarity index 94% rename from CraftBukkit-Patches/0024-Remove-dependency-on-CraftPlayer.getBedSpawnLocation.patch rename to CraftBukkit-Patches/0025-Remove-dependency-on-CraftPlayer.getBedSpawnLocation.patch index a4ee1bc42d..f250654f8a 100644 --- a/CraftBukkit-Patches/0024-Remove-dependency-on-CraftPlayer.getBedSpawnLocation.patch +++ b/CraftBukkit-Patches/0025-Remove-dependency-on-CraftPlayer.getBedSpawnLocation.patch @@ -1,4 +1,4 @@ -From c041fb6421ee248dcd5153a2af8bf89bc7b25a54 Mon Sep 17 00:00:00 2001 +From 5a119c90b95a42f108d8f8160839e3d3e4a1803f 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 @@ -6,7 +6,7 @@ Subject: [PATCH] Remove dependency on CraftPlayer.getBedSpawnLocation; Fixes diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 169fa90..5ccc7f0 100644 +index 0e3a6a1..305855b 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -495,7 +495,14 @@ public abstract class PlayerList { diff --git a/CraftBukkit-Patches/0025-BUKKIT-3661-fixed-missing-HangingBreakEvent-when-Ent.patch b/CraftBukkit-Patches/0026-BUKKIT-3661-fixed-missing-HangingBreakEvent-when-Ent.patch similarity index 96% rename from CraftBukkit-Patches/0025-BUKKIT-3661-fixed-missing-HangingBreakEvent-when-Ent.patch rename to CraftBukkit-Patches/0026-BUKKIT-3661-fixed-missing-HangingBreakEvent-when-Ent.patch index 3405a0797e..e8edc5dfd5 100644 --- a/CraftBukkit-Patches/0025-BUKKIT-3661-fixed-missing-HangingBreakEvent-when-Ent.patch +++ b/CraftBukkit-Patches/0026-BUKKIT-3661-fixed-missing-HangingBreakEvent-when-Ent.patch @@ -1,4 +1,4 @@ -From 62ac86e7fe40da764ea862b8e3f656345a479d75 Mon Sep 17 00:00:00 2001 +From 12a2622e86f7899a78c9ba0f87e4b9e7136e4725 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/0026-Adds-BUKKIT-3667-Faux-sleepers-wake-up-normally.patch b/CraftBukkit-Patches/0027-Adds-BUKKIT-3667-Faux-sleepers-wake-up-normally.patch similarity index 93% rename from CraftBukkit-Patches/0026-Adds-BUKKIT-3667-Faux-sleepers-wake-up-normally.patch rename to CraftBukkit-Patches/0027-Adds-BUKKIT-3667-Faux-sleepers-wake-up-normally.patch index 86dc31d864..0302c35eac 100644 --- a/CraftBukkit-Patches/0026-Adds-BUKKIT-3667-Faux-sleepers-wake-up-normally.patch +++ b/CraftBukkit-Patches/0027-Adds-BUKKIT-3667-Faux-sleepers-wake-up-normally.patch @@ -1,4 +1,4 @@ -From e5914957acf2984ffbfab5615034505a1aa208f5 Mon Sep 17 00:00:00 2001 +From 626c4aad5b26ebcf6e623fcb0e999bf45109fa69 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/0027-PlayerItemDamageEvent.patch b/CraftBukkit-Patches/0028-PlayerItemDamageEvent.patch similarity index 97% rename from CraftBukkit-Patches/0027-PlayerItemDamageEvent.patch rename to CraftBukkit-Patches/0028-PlayerItemDamageEvent.patch index 9610f72642..cbb3c3d935 100644 --- a/CraftBukkit-Patches/0027-PlayerItemDamageEvent.patch +++ b/CraftBukkit-Patches/0028-PlayerItemDamageEvent.patch @@ -1,4 +1,4 @@ -From 1263b12571893f612628d4c6c2c5f1e8df702eef Mon Sep 17 00:00:00 2001 +From 111e5597920a67e93fb8a16c62b747c6628e6679 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/0028-Faster-UUID-for-entities.patch b/CraftBukkit-Patches/0029-Faster-UUID-for-entities.patch similarity index 93% rename from CraftBukkit-Patches/0028-Faster-UUID-for-entities.patch rename to CraftBukkit-Patches/0029-Faster-UUID-for-entities.patch index 6a013b7ca0..671e2e59e3 100644 --- a/CraftBukkit-Patches/0028-Faster-UUID-for-entities.patch +++ b/CraftBukkit-Patches/0029-Faster-UUID-for-entities.patch @@ -1,4 +1,4 @@ -From 533b7ab55d68848c421b5b04f1c0dca131627479 Mon Sep 17 00:00:00 2001 +From 76e2cfc3ac94e006a8d74a7f1fa3209e79336f5c 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/0029-Prevent-NPE-in-CraftSign.patch b/CraftBukkit-Patches/0030-Prevent-NPE-in-CraftSign.patch similarity index 96% rename from CraftBukkit-Patches/0029-Prevent-NPE-in-CraftSign.patch rename to CraftBukkit-Patches/0030-Prevent-NPE-in-CraftSign.patch index 3a0a4b8b87..306405b1d6 100644 --- a/CraftBukkit-Patches/0029-Prevent-NPE-in-CraftSign.patch +++ b/CraftBukkit-Patches/0030-Prevent-NPE-in-CraftSign.patch @@ -1,4 +1,4 @@ -From e18535ba8af6ac3762aafdb822ec821c471edef0 Mon Sep 17 00:00:00 2001 +From 211d7fed6c5a0f051b71d671d651e8aea8583b68 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/0030-Stage-DataWatcher-WatchableObject.patch b/CraftBukkit-Patches/0031-Stage-DataWatcher-WatchableObject.patch similarity index 99% rename from CraftBukkit-Patches/0030-Stage-DataWatcher-WatchableObject.patch rename to CraftBukkit-Patches/0031-Stage-DataWatcher-WatchableObject.patch index ccfd2717e6..41c4e477a4 100644 --- a/CraftBukkit-Patches/0030-Stage-DataWatcher-WatchableObject.patch +++ b/CraftBukkit-Patches/0031-Stage-DataWatcher-WatchableObject.patch @@ -1,4 +1,4 @@ -From 08e448de784e226be1f441d7772ee13dfdf11162 Mon Sep 17 00:00:00 2001 +From 9a9a16e61b6fb3bb4f8d7cd3f2a9d05795c5f437 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/0031-Entity-Tracking-Ranges.patch b/CraftBukkit-Patches/0032-Entity-Tracking-Ranges.patch similarity index 98% rename from CraftBukkit-Patches/0031-Entity-Tracking-Ranges.patch rename to CraftBukkit-Patches/0032-Entity-Tracking-Ranges.patch index 74faf31a2e..98f12149db 100644 --- a/CraftBukkit-Patches/0031-Entity-Tracking-Ranges.patch +++ b/CraftBukkit-Patches/0032-Entity-Tracking-Ranges.patch @@ -1,4 +1,4 @@ -From 2981039788a5b8c88404d5ee18a2bfdfdbcdd9ac Mon Sep 17 00:00:00 2001 +From 2457a6f9b8e0772669d937d137aadcb4999887c8 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 20 Feb 2013 11:58:47 -0500 Subject: [PATCH] Entity Tracking Ranges @@ -130,7 +130,7 @@ index 6a164ca..c434f14 100644 if (filterIps) { try { diff --git a/src/main/resources/configurations/bukkit.yml b/src/main/resources/configurations/bukkit.yml -index d26e644..71374d7 100644 +index 53db120..28d13fb 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/0032-BungeeCord-Support.patch b/CraftBukkit-Patches/0033-BungeeCord-Support.patch similarity index 98% rename from CraftBukkit-Patches/0032-BungeeCord-Support.patch rename to CraftBukkit-Patches/0033-BungeeCord-Support.patch index b729940215..86062c2920 100644 --- a/CraftBukkit-Patches/0032-BungeeCord-Support.patch +++ b/CraftBukkit-Patches/0033-BungeeCord-Support.patch @@ -1,4 +1,4 @@ -From db3159d9b6d9fbc1c40bd0fa9302473af2e73a6d Mon Sep 17 00:00:00 2001 +From a8e6cf9ae9dfc0b75f32d3938fcc13a6e454b31c Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 23 Mar 2013 11:15:11 +1100 Subject: [PATCH] BungeeCord Support @@ -28,7 +28,7 @@ index a945892..7ef9a6f 100644 + // Spigot end } diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 5ccc7f0..6af611a 100644 +index 305855b..e6e9295 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -293,7 +293,7 @@ public abstract class PlayerList { @@ -95,7 +95,7 @@ index 8ec84e1..d70c110 100644 public Spigot spigot() diff --git a/src/main/resources/configurations/bukkit.yml b/src/main/resources/configurations/bukkit.yml -index 71374d7..f0d9129 100644 +index 28d13fb..2e3b242 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/0033-Texture-Pack-Resolutions.patch b/CraftBukkit-Patches/0034-Texture-Pack-Resolutions.patch similarity index 97% rename from CraftBukkit-Patches/0033-Texture-Pack-Resolutions.patch rename to CraftBukkit-Patches/0034-Texture-Pack-Resolutions.patch index c16d6cc96e..cfa30aa349 100644 --- a/CraftBukkit-Patches/0033-Texture-Pack-Resolutions.patch +++ b/CraftBukkit-Patches/0034-Texture-Pack-Resolutions.patch @@ -1,4 +1,4 @@ -From 4ef41da6c5d5959ae5f93d98d2f4aebb464be00a Mon Sep 17 00:00:00 2001 +From 41417b5e0d7636ce9190efd39eda506616c688ae Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 23 Mar 2013 13:04:45 +1100 Subject: [PATCH] Texture Pack Resolutions @@ -52,7 +52,7 @@ index d70c110..3d39d07 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 f0d9129..cdf66e1 100644 +index 2e3b242..4334b20 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/0034-Limit-Custom-Map-Rendering.patch b/CraftBukkit-Patches/0035-Limit-Custom-Map-Rendering.patch similarity index 98% rename from CraftBukkit-Patches/0034-Limit-Custom-Map-Rendering.patch rename to CraftBukkit-Patches/0035-Limit-Custom-Map-Rendering.patch index c1d6bda2ff..4db342cccc 100644 --- a/CraftBukkit-Patches/0034-Limit-Custom-Map-Rendering.patch +++ b/CraftBukkit-Patches/0035-Limit-Custom-Map-Rendering.patch @@ -1,4 +1,4 @@ -From b108a628d8ca2adbe0bcf74982ccbca49089db54 Mon Sep 17 00:00:00 2001 +From bf85ea164d7cfbaa34ea05c1dcca438a2597f932 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/0035-Revert-Throw-exception-for-disabled-plugin-tasks.-Fi.patch b/CraftBukkit-Patches/0036-Revert-Throw-exception-for-disabled-plugin-tasks.-Fi.patch similarity index 95% rename from CraftBukkit-Patches/0035-Revert-Throw-exception-for-disabled-plugin-tasks.-Fi.patch rename to CraftBukkit-Patches/0036-Revert-Throw-exception-for-disabled-plugin-tasks.-Fi.patch index 8564b55ace..23995feb8d 100644 --- a/CraftBukkit-Patches/0035-Revert-Throw-exception-for-disabled-plugin-tasks.-Fi.patch +++ b/CraftBukkit-Patches/0036-Revert-Throw-exception-for-disabled-plugin-tasks.-Fi.patch @@ -1,4 +1,4 @@ -From 52539ec48972b810f9f8d459956262eba3472533 Mon Sep 17 00:00:00 2001 +From 13dd8ea7ee00ede17a97035e436366f1449b46b5 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/0036-Enable-Improved-ping-sending.patch b/CraftBukkit-Patches/0037-Enable-Improved-ping-sending.patch similarity index 95% rename from CraftBukkit-Patches/0036-Enable-Improved-ping-sending.patch rename to CraftBukkit-Patches/0037-Enable-Improved-ping-sending.patch index 66731c37ac..836dbfb2ab 100644 --- a/CraftBukkit-Patches/0036-Enable-Improved-ping-sending.patch +++ b/CraftBukkit-Patches/0037-Enable-Improved-ping-sending.patch @@ -1,4 +1,4 @@ -From ecac6ac2d1fe5e3ee100248f6ae7e4bb98ccf153 Mon Sep 17 00:00:00 2001 +From 627ec65c6d5dd38514047c86a97e3e7b3264ad8a Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 24 Feb 2013 20:45:20 +1100 Subject: [PATCH] Enable Improved ping sending @@ -20,7 +20,7 @@ index 9925d1b..5fa0b05 100644 public EntityPlayer(MinecraftServer minecraftserver, World world, String s, PlayerInteractManager playerinteractmanager) { diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 6af611a..0a48245 100644 +index e6e9295..d5387f3 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -724,7 +724,23 @@ public abstract class PlayerList { @@ -48,7 +48,7 @@ index 6af611a..0a48245 100644 public void sendAll(Packet packet) { for (int i = 0; i < this.players.size(); ++i) { diff --git a/src/main/resources/configurations/bukkit.yml b/src/main/resources/configurations/bukkit.yml -index cdf66e1..8f48c0f 100644 +index 4334b20..5d2ef1f 100644 --- a/src/main/resources/configurations/bukkit.yml +++ b/src/main/resources/configurations/bukkit.yml @@ -34,6 +34,7 @@ settings: diff --git a/CraftBukkit-Patches/0037-Prevent-handshake-spam-from-invalid-names.patch b/CraftBukkit-Patches/0038-Prevent-handshake-spam-from-invalid-names.patch similarity index 97% rename from CraftBukkit-Patches/0037-Prevent-handshake-spam-from-invalid-names.patch rename to CraftBukkit-Patches/0038-Prevent-handshake-spam-from-invalid-names.patch index 7f16bc4240..bd1b02bfcb 100644 --- a/CraftBukkit-Patches/0037-Prevent-handshake-spam-from-invalid-names.patch +++ b/CraftBukkit-Patches/0038-Prevent-handshake-spam-from-invalid-names.patch @@ -1,4 +1,4 @@ -From 42b62f094b969198fa9c03249dcd16f45a56ddff Mon Sep 17 00:00:00 2001 +From 81f88d23c1dcc15e62eb9fcb97342102fd31365d 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/0038-Save-entity-counts-for-randomly-spawned-creatures-to.patch b/CraftBukkit-Patches/0039-Save-entity-counts-for-randomly-spawned-creatures-to.patch similarity index 97% rename from CraftBukkit-Patches/0038-Save-entity-counts-for-randomly-spawned-creatures-to.patch rename to CraftBukkit-Patches/0039-Save-entity-counts-for-randomly-spawned-creatures-to.patch index 6e8edec999..f97e07fcd1 100644 --- a/CraftBukkit-Patches/0038-Save-entity-counts-for-randomly-spawned-creatures-to.patch +++ b/CraftBukkit-Patches/0039-Save-entity-counts-for-randomly-spawned-creatures-to.patch @@ -1,4 +1,4 @@ -From 95080f9e04c482ed4933127e6fc168bacda5705b Mon Sep 17 00:00:00 2001 +From a34377aa0ddc9cdabd9e41f857c8bfde6ebdc6f5 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/0039-Thread-Naming-and-Tweaks.patch b/CraftBukkit-Patches/0040-Thread-Naming-and-Tweaks.patch similarity index 98% rename from CraftBukkit-Patches/0039-Thread-Naming-and-Tweaks.patch rename to CraftBukkit-Patches/0040-Thread-Naming-and-Tweaks.patch index d700cd0590..2eee9dd692 100644 --- a/CraftBukkit-Patches/0039-Thread-Naming-and-Tweaks.patch +++ b/CraftBukkit-Patches/0040-Thread-Naming-and-Tweaks.patch @@ -1,4 +1,4 @@ -From a2fe5c56cdf05ae4b6059efbcef0944e6996d948 Mon Sep 17 00:00:00 2001 +From d69137517d36580dd8db3facc9096a3c3cbe06cd 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 diff --git a/CraftBukkit-Patches/0040-Fixes-BUKKIT-3893-Close-world-save-files-when-world-.patch b/CraftBukkit-Patches/0041-Fixes-BUKKIT-3893-Close-world-save-files-when-world-.patch similarity index 97% rename from CraftBukkit-Patches/0040-Fixes-BUKKIT-3893-Close-world-save-files-when-world-.patch rename to CraftBukkit-Patches/0041-Fixes-BUKKIT-3893-Close-world-save-files-when-world-.patch index b9130d4899..f1160d9436 100644 --- a/CraftBukkit-Patches/0040-Fixes-BUKKIT-3893-Close-world-save-files-when-world-.patch +++ b/CraftBukkit-Patches/0041-Fixes-BUKKIT-3893-Close-world-save-files-when-world-.patch @@ -1,4 +1,4 @@ -From 5c5037722c8a053eb892c71f334b0ed326c6d12b Mon Sep 17 00:00:00 2001 +From c145a0a19efdef87145f09ef3a6f1bb4958f77d1 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/0041-Optimized-version-of-LocaleLanguage.patch b/CraftBukkit-Patches/0042-Optimized-version-of-LocaleLanguage.patch similarity index 98% rename from CraftBukkit-Patches/0041-Optimized-version-of-LocaleLanguage.patch rename to CraftBukkit-Patches/0042-Optimized-version-of-LocaleLanguage.patch index 1020609490..127283f582 100644 --- a/CraftBukkit-Patches/0041-Optimized-version-of-LocaleLanguage.patch +++ b/CraftBukkit-Patches/0042-Optimized-version-of-LocaleLanguage.patch @@ -1,4 +1,4 @@ -From 1eda0bec0c7a569e15b92245bbbebddeaecb2caf Mon Sep 17 00:00:00 2001 +From 5076b8f71c5aa46eef3d3bcc734741f271677cd7 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/0042-Improve-next-tick-list-performance-on-chunk-unloads-.patch b/CraftBukkit-Patches/0043-Improve-next-tick-list-performance-on-chunk-unloads-.patch similarity index 99% rename from CraftBukkit-Patches/0042-Improve-next-tick-list-performance-on-chunk-unloads-.patch rename to CraftBukkit-Patches/0043-Improve-next-tick-list-performance-on-chunk-unloads-.patch index 51269d3537..31d05415f7 100644 --- a/CraftBukkit-Patches/0042-Improve-next-tick-list-performance-on-chunk-unloads-.patch +++ b/CraftBukkit-Patches/0043-Improve-next-tick-list-performance-on-chunk-unloads-.patch @@ -1,4 +1,4 @@ -From 9dea1322ad60ddc96a42387dd4f8e5ff2093238b Mon Sep 17 00:00:00 2001 +From e079a5053465c9a2f4f326e11e5d6afc524bfbee 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 diff --git a/CraftBukkit-Patches/0043-Remove-o-Option.patch b/CraftBukkit-Patches/0044-Remove-o-Option.patch similarity index 92% rename from CraftBukkit-Patches/0043-Remove-o-Option.patch rename to CraftBukkit-Patches/0044-Remove-o-Option.patch index 07529cf4a4..7ccd8ed690 100644 --- a/CraftBukkit-Patches/0043-Remove-o-Option.patch +++ b/CraftBukkit-Patches/0044-Remove-o-Option.patch @@ -1,4 +1,4 @@ -From cbb1e2e40b20215c1dd05ce7d37c68a9ef30b17f Mon Sep 17 00:00:00 2001 +From fc463031676c11d34103f0bdf84995b05f18dc2f Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 19 May 2013 18:29:48 +1000 Subject: [PATCH] Remove -o Option diff --git a/CraftBukkit-Patches/0044-Recipe-Deconstruction.patch b/CraftBukkit-Patches/0045-Recipe-Deconstruction.patch similarity index 97% rename from CraftBukkit-Patches/0044-Recipe-Deconstruction.patch rename to CraftBukkit-Patches/0045-Recipe-Deconstruction.patch index d80b32b598..fb9b6503dd 100644 --- a/CraftBukkit-Patches/0044-Recipe-Deconstruction.patch +++ b/CraftBukkit-Patches/0045-Recipe-Deconstruction.patch @@ -1,4 +1,4 @@ -From 6f48274508277dd764275202cbfe35bdb5f209e3 Mon Sep 17 00:00:00 2001 +From 89a379ee320a63bcb60b259318c8b2535ffa54d5 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 1 Jun 2013 16:34:38 +1000 Subject: [PATCH] Recipe Deconstruction diff --git a/CraftBukkit-Patches/0045-Fix-Health-Scaling.patch b/CraftBukkit-Patches/0046-Fix-Health-Scaling.patch similarity index 97% rename from CraftBukkit-Patches/0045-Fix-Health-Scaling.patch rename to CraftBukkit-Patches/0046-Fix-Health-Scaling.patch index 1b4ed63168..2bc6356dc8 100644 --- a/CraftBukkit-Patches/0045-Fix-Health-Scaling.patch +++ b/CraftBukkit-Patches/0046-Fix-Health-Scaling.patch @@ -1,4 +1,4 @@ -From 4645cf5de8a97078bfab381db000f82ae781ed8f Mon Sep 17 00:00:00 2001 +From b8d7cd050a8307a8acdc2d0d3fcc0dbad25fe29f Mon Sep 17 00:00:00 2001 From: Nick Minkler Date: Sun, 2 Jun 2013 14:54:11 +1000 Subject: [PATCH] Fix Health Scaling diff --git a/CraftBukkit-Patches/0046-Fix-EntityShootBowEvent-with-Skeletons.patch b/CraftBukkit-Patches/0047-Fix-EntityShootBowEvent-with-Skeletons.patch similarity index 95% rename from CraftBukkit-Patches/0046-Fix-EntityShootBowEvent-with-Skeletons.patch rename to CraftBukkit-Patches/0047-Fix-EntityShootBowEvent-with-Skeletons.patch index 2caea0d55a..e510702b25 100644 --- a/CraftBukkit-Patches/0046-Fix-EntityShootBowEvent-with-Skeletons.patch +++ b/CraftBukkit-Patches/0047-Fix-EntityShootBowEvent-with-Skeletons.patch @@ -1,4 +1,4 @@ -From 856246399b92629d9e8040987e04388b490b9a91 Mon Sep 17 00:00:00 2001 +From 050cf2918a4a0d2b62d2aa2baf727e2c38e5820b Mon Sep 17 00:00:00 2001 From: Nick Minkler Date: Sun, 2 Jun 2013 15:04:37 +1000 Subject: [PATCH] Fix EntityShootBowEvent with Skeletons diff --git a/CraftBukkit-Patches/0047-Implement-Arrow-API.patch b/CraftBukkit-Patches/0048-Implement-Arrow-API.patch similarity index 93% rename from CraftBukkit-Patches/0047-Implement-Arrow-API.patch rename to CraftBukkit-Patches/0048-Implement-Arrow-API.patch index 584723cdec..5948ecaaaa 100644 --- a/CraftBukkit-Patches/0047-Implement-Arrow-API.patch +++ b/CraftBukkit-Patches/0048-Implement-Arrow-API.patch @@ -1,4 +1,4 @@ -From 6d7480f55a2722135709441b35387dcab70bbdcb Mon Sep 17 00:00:00 2001 +From 322af2ad092cd8ad39a1d82454d7b0186e8a2553 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Jun 2013 15:16:05 +1000 Subject: [PATCH] Implement Arrow API diff --git a/CraftBukkit-Patches/0048-Particle-API.patch b/CraftBukkit-Patches/0049-Particle-API.patch similarity index 99% rename from CraftBukkit-Patches/0048-Particle-API.patch rename to CraftBukkit-Patches/0049-Particle-API.patch index cd49f27db9..f46a743daf 100644 --- a/CraftBukkit-Patches/0048-Particle-API.patch +++ b/CraftBukkit-Patches/0049-Particle-API.patch @@ -1,4 +1,4 @@ -From ba6bfe5a1b4eac8a2700b40870ffb2f0faad617e Mon Sep 17 00:00:00 2001 +From 3667861408f4060846b4e5faa62b74a6e82f73b2 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Jun 2013 16:14:30 +1000 Subject: [PATCH] Particle API diff --git a/CraftBukkit-Patches/0049-Hopper-Cooldowns.patch b/CraftBukkit-Patches/0050-Hopper-Cooldowns.patch similarity index 97% rename from CraftBukkit-Patches/0049-Hopper-Cooldowns.patch rename to CraftBukkit-Patches/0050-Hopper-Cooldowns.patch index ea9a639898..3c82482796 100644 --- a/CraftBukkit-Patches/0049-Hopper-Cooldowns.patch +++ b/CraftBukkit-Patches/0050-Hopper-Cooldowns.patch @@ -1,4 +1,4 @@ -From 586597e0ad25279f6e81b1e5e710d9e8f8a76f82 Mon Sep 17 00:00:00 2001 +From 028837b3b8f3dfb6d2f290de6cea6cd645b07455 Mon Sep 17 00:00:00 2001 From: DerFlash Date: Sun, 2 Jun 2013 16:23:46 +1000 Subject: [PATCH] Hopper Cooldowns @@ -86,10 +86,10 @@ index c7ef0e1..bbfcd97 100644 if (metrics == null) { try { diff --git a/src/main/resources/configurations/bukkit.yml b/src/main/resources/configurations/bukkit.yml -index 8f48c0f..830f3e6 100644 +index 5d2ef1f..c056762 100644 --- a/src/main/resources/configurations/bukkit.yml +++ b/src/main/resources/configurations/bukkit.yml -@@ -84,6 +84,8 @@ ticks-per: +@@ -83,6 +83,8 @@ ticks-per: animal-spawns: 400 monster-spawns: 1 autosave: 0 diff --git a/CraftBukkit-Patches/0050-Prevent-Shutdown-Hang.patch b/CraftBukkit-Patches/0051-Prevent-Shutdown-Hang.patch similarity index 94% rename from CraftBukkit-Patches/0050-Prevent-Shutdown-Hang.patch rename to CraftBukkit-Patches/0051-Prevent-Shutdown-Hang.patch index 777995bf50..6f41301ed9 100644 --- a/CraftBukkit-Patches/0050-Prevent-Shutdown-Hang.patch +++ b/CraftBukkit-Patches/0051-Prevent-Shutdown-Hang.patch @@ -1,4 +1,4 @@ -From d85099a3bdf56d4f398ce0045acb9b66f9a91886 Mon Sep 17 00:00:00 2001 +From d8ae55e32ccec6edd8a777375731a69f7b310649 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 11 Jun 2013 11:54:32 +1000 Subject: [PATCH] Prevent Shutdown Hang