diff --git a/CraftBukkit-Patches/0002-mc-dev-imports.patch b/CraftBukkit-Patches/0002-mc-dev-imports.patch index 221f65bb17..3d799c469c 100644 --- a/CraftBukkit-Patches/0002-mc-dev-imports.patch +++ b/CraftBukkit-Patches/0002-mc-dev-imports.patch @@ -1,4 +1,4 @@ -From d1cf8a682f9fe9a4a32f7590869243c259db4461 Mon Sep 17 00:00:00 2001 +From 6fd3d3a404c44bdb8aac56011d38dc5ff8a07ff8 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 1 Dec 2013 15:10:48 +1100 Subject: [PATCH] mc-dev imports @@ -769,7 +769,7 @@ index 0000000..e943676 +} diff --git a/src/main/java/net/minecraft/server/CommandDispatcher.java b/src/main/java/net/minecraft/server/CommandDispatcher.java new file mode 100644 -index 0000000..4c21643 +index 0000000..2676e9e --- /dev/null +++ b/src/main/java/net/minecraft/server/CommandDispatcher.java @@ -0,0 +1,94 @@ @@ -811,7 +811,7 @@ index 0000000..4c21643 + this.a(new CommandSetBlock()); + this.a(new CommandTestForBlock()); + this.a(new CommandTellRaw()); -+ if (MinecraftServer.getServer().W()) { ++ if (MinecraftServer.getServer().X()) { + this.a(new CommandOp()); + this.a(new CommandDeop()); + this.a(new CommandStop()); @@ -852,7 +852,7 @@ index 0000000..4c21643 + while (iterator.hasNext()) { + EntityPlayer entityplayer = (EntityPlayer) iterator.next(); + -+ if (entityplayer != icommandlistener && MinecraftServer.getServer().getPlayerList().isOp(entityplayer.getName()) && icommand.canUse(entityplayer) && (!(icommandlistener instanceof RemoteControlCommandListener) || MinecraftServer.getServer().m())) { ++ if (entityplayer != icommandlistener && MinecraftServer.getServer().getPlayerList().isOp(entityplayer.getProfile()) && icommand.canUse(entityplayer) && (!(icommandlistener instanceof RemoteControlCommandListener) || MinecraftServer.getServer().m())) { + entityplayer.sendMessage(chatmessage); + } + } @@ -2178,7 +2178,7 @@ index 0000000..d7d93a0 +} diff --git a/src/main/java/net/minecraft/server/ServerStatisticManager.java b/src/main/java/net/minecraft/server/ServerStatisticManager.java new file mode 100644 -index 0000000..0becb94 +index 0000000..819896f --- /dev/null +++ b/src/main/java/net/minecraft/server/ServerStatisticManager.java @@ -0,0 +1,202 @@ @@ -2246,7 +2246,7 @@ index 0000000..0becb94 + this.e.add(statistic); + if (statistic.d() && j == 0 && i > 0) { + this.g = true; -+ if (this.c.as()) { ++ if (this.c.at()) { + this.c.getPlayerList().sendMessage(new ChatMessage("chat.type.achievement", new Object[] { entityhuman.getScoreboardDisplayName(), statistic.j()})); + } + } @@ -2347,7 +2347,7 @@ index 0000000..0becb94 + } + + public void a(EntityPlayer entityplayer) { -+ int i = this.c.ak(); ++ int i = this.c.al(); + HashMap hashmap = Maps.newHashMap(); + + if (this.g || i - this.f > 300) { @@ -2767,5 +2767,5 @@ index 0000000..c0db754 + } +} -- -1.8.5.2.msysgit.0 +1.8.3.2 diff --git a/CraftBukkit-Patches/0057-Watchdog-Thread.patch b/CraftBukkit-Patches/0057-Watchdog-Thread.patch index 117663204d..4f311c2333 100644 --- a/CraftBukkit-Patches/0057-Watchdog-Thread.patch +++ b/CraftBukkit-Patches/0057-Watchdog-Thread.patch @@ -1,4 +1,4 @@ -From e09cbea98b0a13596e4c88b797bddeed8bf1a883 Mon Sep 17 00:00:00 2001 +From 9cb6e8e5ee6083bf3d3d76cf01d6d56635b16deb Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 23 Feb 2013 12:33:20 +1100 Subject: [PATCH] Watchdog Thread. @@ -26,7 +26,7 @@ index 16e3596..883c3b5 100644 } diff --git a/src/main/java/org/spigotmc/RestartCommand.java b/src/main/java/org/spigotmc/RestartCommand.java new file mode 100644 -index 0000000..2d330fc +index 0000000..917a931 --- /dev/null +++ b/src/main/java/org/spigotmc/RestartCommand.java @@ -0,0 +1,110 @@ @@ -83,7 +83,7 @@ index 0000000..2d330fc + { + } + // Close the socket so we can rebind with the new process -+ MinecraftServer.getServer().ah().b(); ++ MinecraftServer.getServer().ai().b(); + + // Give time for it to kick in + try diff --git a/CraftBukkit-Patches/0092-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch b/CraftBukkit-Patches/0091-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch similarity index 96% rename from CraftBukkit-Patches/0092-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch rename to CraftBukkit-Patches/0091-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch index f6b3e7f714..7c9b28f7b9 100644 --- a/CraftBukkit-Patches/0092-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch +++ b/CraftBukkit-Patches/0091-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch @@ -1,4 +1,4 @@ -From f57374062ecd85de9558aa42a4cfca174451d78f Mon Sep 17 00:00:00 2001 +From 9606ed88d74e97e1b34a8d49f0769144b8dcde01 Mon Sep 17 00:00:00 2001 From: Dmck2b Date: Mon, 20 Jan 2014 20:18:23 +0000 Subject: [PATCH] Allow toggling of ZombiePigmen spawning in portal blocks diff --git a/CraftBukkit-Patches/0091-Reduce-memory-of-hiddenPlayers-map.patch b/CraftBukkit-Patches/0091-Reduce-memory-of-hiddenPlayers-map.patch deleted file mode 100644 index c1738b061e..0000000000 --- a/CraftBukkit-Patches/0091-Reduce-memory-of-hiddenPlayers-map.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 74249e2ee71bdc4a02aa1f0d484f12d48686311a Mon Sep 17 00:00:00 2001 -From: md_5 -Date: Mon, 20 Jan 2014 13:50:32 +1100 -Subject: [PATCH] Reduce memory of hiddenPlayers map. - - -diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 2c129ac..1d6d1ba 100644 ---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -66,7 +66,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { - private boolean hasPlayedBefore = false; - private final ConversationTracker conversationTracker = new ConversationTracker(); - private final Set channels = new HashSet(); -- private final Set hiddenPlayers = new HashSet(); -+ private final Map hiddenPlayers = new MapMaker().weakValues().makeMap(); // Spigot - soft -> weak - private int hash = 0; - private double health = 20; - private boolean scaledHealth = false; --- -1.8.3.2 - diff --git a/CraftBukkit-Patches/0093-Don-t-let-trees-replace-any-block-when-growing.patch b/CraftBukkit-Patches/0092-Don-t-let-trees-replace-any-block-when-growing.patch similarity index 95% rename from CraftBukkit-Patches/0093-Don-t-let-trees-replace-any-block-when-growing.patch rename to CraftBukkit-Patches/0092-Don-t-let-trees-replace-any-block-when-growing.patch index c14f1cc7d4..b1a16b4e0b 100644 --- a/CraftBukkit-Patches/0093-Don-t-let-trees-replace-any-block-when-growing.patch +++ b/CraftBukkit-Patches/0092-Don-t-let-trees-replace-any-block-when-growing.patch @@ -1,4 +1,4 @@ -From ecd2a9040b87a1ad4f9c595474364ec03e144465 Mon Sep 17 00:00:00 2001 +From 2d53f0548e60d1c8e6a2ef7dac7e0595389369ad Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Mon, 20 Jan 2014 20:42:28 +0000 Subject: [PATCH] Don't let trees replace any block when growing diff --git a/CraftBukkit-Patches/0094-Highly-Optimized-Tick-Loop.patch b/CraftBukkit-Patches/0093-Highly-Optimized-Tick-Loop.patch similarity index 99% rename from CraftBukkit-Patches/0094-Highly-Optimized-Tick-Loop.patch rename to CraftBukkit-Patches/0093-Highly-Optimized-Tick-Loop.patch index 2cb0b87533..1f348bbde6 100644 --- a/CraftBukkit-Patches/0094-Highly-Optimized-Tick-Loop.patch +++ b/CraftBukkit-Patches/0093-Highly-Optimized-Tick-Loop.patch @@ -1,4 +1,4 @@ -From de8ae04deda9f654974e5fdffacff684cb572bac Mon Sep 17 00:00:00 2001 +From 09196b2fdf802664cadfe37c650c636ced7ebc6c Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 25 Jan 2014 14:08:35 +1100 Subject: [PATCH] Highly Optimized Tick Loop diff --git a/CraftBukkit-Patches/0095-Add-Spigot-Links.patch b/CraftBukkit-Patches/0094-Add-Spigot-Links.patch similarity index 98% rename from CraftBukkit-Patches/0095-Add-Spigot-Links.patch rename to CraftBukkit-Patches/0094-Add-Spigot-Links.patch index a028e48076..12a32d0ee6 100644 --- a/CraftBukkit-Patches/0095-Add-Spigot-Links.patch +++ b/CraftBukkit-Patches/0094-Add-Spigot-Links.patch @@ -1,4 +1,4 @@ -From 901a07f32926251caba25e4f5752ab39ce50199c Mon Sep 17 00:00:00 2001 +From 215451881602f5ccd2cbcbf8944d188f87e7b992 Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 23 Jan 2014 13:17:35 +1100 Subject: [PATCH] Add Spigot Links diff --git a/CraftBukkit-Patches/0096-Configurable-Ping-Sample-Size.patch b/CraftBukkit-Patches/0095-Configurable-Ping-Sample-Size.patch similarity index 96% rename from CraftBukkit-Patches/0096-Configurable-Ping-Sample-Size.patch rename to CraftBukkit-Patches/0095-Configurable-Ping-Sample-Size.patch index e624a0e4c9..baa61a6bf9 100644 --- a/CraftBukkit-Patches/0096-Configurable-Ping-Sample-Size.patch +++ b/CraftBukkit-Patches/0095-Configurable-Ping-Sample-Size.patch @@ -1,4 +1,4 @@ -From 69d28ad3c473998bb35bb51239c0e297027e3596 Mon Sep 17 00:00:00 2001 +From 417610f025b776ab0799f17c024718fc00348733 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 26 Jan 2014 21:48:34 +1100 Subject: [PATCH] Configurable Ping Sample Size diff --git a/CraftBukkit-Patches/0097-Add-Optional-Tick-Shuffling.patch b/CraftBukkit-Patches/0096-Add-Optional-Tick-Shuffling.patch similarity index 96% rename from CraftBukkit-Patches/0097-Add-Optional-Tick-Shuffling.patch rename to CraftBukkit-Patches/0096-Add-Optional-Tick-Shuffling.patch index 31ba443892..36de99e49d 100644 --- a/CraftBukkit-Patches/0097-Add-Optional-Tick-Shuffling.patch +++ b/CraftBukkit-Patches/0096-Add-Optional-Tick-Shuffling.patch @@ -1,4 +1,4 @@ -From 5fe67299aa85203afec737cea401214f227e29cd Mon Sep 17 00:00:00 2001 +From 6bc14531206238310ba1247f61fcba97643dd161 Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 27 Jan 2014 08:39:26 +1100 Subject: [PATCH] Add Optional Tick Shuffling diff --git a/CraftBukkit-Patches/0098-Allow-Configuring-Chunks-per-Packet.patch b/CraftBukkit-Patches/0097-Allow-Configuring-Chunks-per-Packet.patch similarity index 96% rename from CraftBukkit-Patches/0098-Allow-Configuring-Chunks-per-Packet.patch rename to CraftBukkit-Patches/0097-Allow-Configuring-Chunks-per-Packet.patch index ef25142e94..fa3d018993 100644 --- a/CraftBukkit-Patches/0098-Allow-Configuring-Chunks-per-Packet.patch +++ b/CraftBukkit-Patches/0097-Allow-Configuring-Chunks-per-Packet.patch @@ -1,4 +1,4 @@ -From d19940c7cd134b2210cb77fd7603f23dadaf5781 Mon Sep 17 00:00:00 2001 +From b23a8af39fa45b1174fa93bd92a1bf61250e4023 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 28 Jan 2014 20:35:35 +1100 Subject: [PATCH] Allow Configuring Chunks per Packet diff --git a/CraftBukkit-Patches/0099-Implement-Locale-Getter-for-Players.patch b/CraftBukkit-Patches/0098-Implement-Locale-Getter-for-Players.patch similarity index 94% rename from CraftBukkit-Patches/0099-Implement-Locale-Getter-for-Players.patch rename to CraftBukkit-Patches/0098-Implement-Locale-Getter-for-Players.patch index e855694c41..84897a0b41 100644 --- a/CraftBukkit-Patches/0099-Implement-Locale-Getter-for-Players.patch +++ b/CraftBukkit-Patches/0098-Implement-Locale-Getter-for-Players.patch @@ -1,4 +1,4 @@ -From aaa3e437bd68627f59bb3cd76ab0888d41140581 Mon Sep 17 00:00:00 2001 +From 5821acb4eb7b20891c07ae0cb701e2860dd6c696 Mon Sep 17 00:00:00 2001 From: Smove Date: Sat, 1 Feb 2014 18:12:16 +1100 Subject: [PATCH] Implement Locale Getter for Players @@ -18,7 +18,7 @@ index 585df73..4fb5f75 100644 public final MinecraftServer server; public final PlayerInteractManager playerInteractManager; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 1d6d1ba..3443f55 100644 +index 2c129ac..6f008db 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1368,6 +1368,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/CraftBukkit-Patches/0100-Cap-Entity-Collisions.patch b/CraftBukkit-Patches/0099-Cap-Entity-Collisions.patch similarity index 97% rename from CraftBukkit-Patches/0100-Cap-Entity-Collisions.patch rename to CraftBukkit-Patches/0099-Cap-Entity-Collisions.patch index 80590c72ef..ed29452a1a 100644 --- a/CraftBukkit-Patches/0100-Cap-Entity-Collisions.patch +++ b/CraftBukkit-Patches/0099-Cap-Entity-Collisions.patch @@ -1,4 +1,4 @@ -From 296bdb60b68801353cd301df8987d1f3d5572618 Mon Sep 17 00:00:00 2001 +From 529916ed53368b405e0fec69b993dba3d4562c15 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 31 Jan 2014 11:18:34 -0500 Subject: [PATCH] Cap Entity Collisions diff --git a/CraftBukkit-Patches/0101-Fix-dispensing-bone-meal-not-having-the-correct-data.patch b/CraftBukkit-Patches/0100-Fix-dispensing-bone-meal-not-having-the-correct-data.patch similarity index 94% rename from CraftBukkit-Patches/0101-Fix-dispensing-bone-meal-not-having-the-correct-data.patch rename to CraftBukkit-Patches/0100-Fix-dispensing-bone-meal-not-having-the-correct-data.patch index 37dcb0ea1a..c4ba4587da 100644 --- a/CraftBukkit-Patches/0101-Fix-dispensing-bone-meal-not-having-the-correct-data.patch +++ b/CraftBukkit-Patches/0100-Fix-dispensing-bone-meal-not-having-the-correct-data.patch @@ -1,4 +1,4 @@ -From f2dbec7d9562e1ec29732a9e06f8ff412ffcb8e9 Mon Sep 17 00:00:00 2001 +From 1e0c6cd80d0e92f6af9ce7d23b3f89f34e0f49d4 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Thu, 6 Feb 2014 21:59:20 +0000 Subject: [PATCH] Fix dispensing bone meal not having the correct data value diff --git a/CraftBukkit-Patches/0102-Spam-Filter-Exclusions.patch b/CraftBukkit-Patches/0101-Spam-Filter-Exclusions.patch similarity index 97% rename from CraftBukkit-Patches/0102-Spam-Filter-Exclusions.patch rename to CraftBukkit-Patches/0101-Spam-Filter-Exclusions.patch index baa8fd4bf2..dc977e63a0 100644 --- a/CraftBukkit-Patches/0102-Spam-Filter-Exclusions.patch +++ b/CraftBukkit-Patches/0101-Spam-Filter-Exclusions.patch @@ -1,4 +1,4 @@ -From 9079943fde839278e0d4f962d3f5e27b819235db Mon Sep 17 00:00:00 2001 +From 8416d3c33ad72d602ce5a61b4b8a704bb2290ab6 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 8 Feb 2014 08:13:40 +0000 Subject: [PATCH] Spam Filter Exclusions diff --git a/CraftBukkit-Patches/0103-Add-Option-to-Silence-CommandBlock-Console.patch b/CraftBukkit-Patches/0102-Add-Option-to-Silence-CommandBlock-Console.patch similarity index 93% rename from CraftBukkit-Patches/0103-Add-Option-to-Silence-CommandBlock-Console.patch rename to CraftBukkit-Patches/0102-Add-Option-to-Silence-CommandBlock-Console.patch index 7e29fcc027..341884e3d5 100644 --- a/CraftBukkit-Patches/0103-Add-Option-to-Silence-CommandBlock-Console.patch +++ b/CraftBukkit-Patches/0102-Add-Option-to-Silence-CommandBlock-Console.patch @@ -1,11 +1,11 @@ -From 9f2767b020cc96e769795d094d80f3a5a2f324cd Mon Sep 17 00:00:00 2001 +From b6dc5546cc63f84dd179b632c18b1df795530175 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 9 Feb 2014 14:39:01 +1100 Subject: [PATCH] Add Option to Silence CommandBlock Console diff --git a/src/main/java/net/minecraft/server/CommandDispatcher.java b/src/main/java/net/minecraft/server/CommandDispatcher.java -index 4c21643..4e4f001 100644 +index 2676e9e..caced26 100644 --- a/src/main/java/net/minecraft/server/CommandDispatcher.java +++ b/src/main/java/net/minecraft/server/CommandDispatcher.java @@ -83,7 +83,7 @@ public class CommandDispatcher extends CommandHandler implements ICommandDispatc diff --git a/CraftBukkit-Patches/0104-Add-support-for-fetching-hidden-players.patch b/CraftBukkit-Patches/0103-Add-support-for-fetching-hidden-players.patch similarity index 89% rename from CraftBukkit-Patches/0104-Add-support-for-fetching-hidden-players.patch rename to CraftBukkit-Patches/0103-Add-support-for-fetching-hidden-players.patch index 42fb2eb5b3..b0f1cbd383 100644 --- a/CraftBukkit-Patches/0104-Add-support-for-fetching-hidden-players.patch +++ b/CraftBukkit-Patches/0103-Add-support-for-fetching-hidden-players.patch @@ -1,11 +1,11 @@ -From 733a15b3cf49c23bf2265c014ca905788d887844 Mon Sep 17 00:00:00 2001 +From 96f5ab167d2dc52dd71692bd9ed200fa7bd46569 Mon Sep 17 00:00:00 2001 From: Tux Date: Sun, 9 Feb 2014 14:03:03 -0500 Subject: [PATCH] Add support for fetching hidden players diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 3443f55..1934132 100644 +index 6f008db..302305d 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1374,6 +1374,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/CraftBukkit-Patches/0105-Allow-Disabling-Creative-Item-Filter.patch b/CraftBukkit-Patches/0104-Allow-Disabling-Creative-Item-Filter.patch similarity index 96% rename from CraftBukkit-Patches/0105-Allow-Disabling-Creative-Item-Filter.patch rename to CraftBukkit-Patches/0104-Allow-Disabling-Creative-Item-Filter.patch index b6bd84ce82..e3df0b2fc4 100644 --- a/CraftBukkit-Patches/0105-Allow-Disabling-Creative-Item-Filter.patch +++ b/CraftBukkit-Patches/0104-Allow-Disabling-Creative-Item-Filter.patch @@ -1,4 +1,4 @@ -From badfa468d2663db83ce8fcab80d1188941f1a54f Mon Sep 17 00:00:00 2001 +From 6c4be5d3b8bb4ef259f6603f266d95494cc5c48d Mon Sep 17 00:00:00 2001 From: md_5 Date: Wed, 12 Feb 2014 18:18:01 +1100 Subject: [PATCH] Allow Disabling Creative Item Filter diff --git a/CraftBukkit-Patches/0106-Cap-Channel-Registrations.patch b/CraftBukkit-Patches/0105-Cap-Channel-Registrations.patch similarity index 89% rename from CraftBukkit-Patches/0106-Cap-Channel-Registrations.patch rename to CraftBukkit-Patches/0105-Cap-Channel-Registrations.patch index 12cc4abc58..621ee2122d 100644 --- a/CraftBukkit-Patches/0106-Cap-Channel-Registrations.patch +++ b/CraftBukkit-Patches/0105-Cap-Channel-Registrations.patch @@ -1,11 +1,11 @@ -From f8f8985ada082e25b2f24f576655c8bcfc53955e Mon Sep 17 00:00:00 2001 +From 3f57d662050d82f855ea788f52df1d5bf8b004fd Mon Sep 17 00:00:00 2001 From: md_5 Date: Wed, 12 Feb 2014 20:02:58 +1100 Subject: [PATCH] Cap Channel Registrations diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 1934132..d33502a 100644 +index 302305d..8af4bf7 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1056,6 +1056,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/CraftBukkit-Patches/0107-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch b/CraftBukkit-Patches/0106-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch similarity index 99% rename from CraftBukkit-Patches/0107-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch rename to CraftBukkit-Patches/0106-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch index 0e466a7304..06e1af4b04 100644 --- a/CraftBukkit-Patches/0107-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch +++ b/CraftBukkit-Patches/0106-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch @@ -1,4 +1,4 @@ -From e7b60e8bc41205e2bbc11de51d73f5208e1f3b80 Mon Sep 17 00:00:00 2001 +From bc0b98f5a44d114aeeb8fc0b9433685c822ad781 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Wed, 12 Feb 2014 20:44:14 +0000 Subject: [PATCH] Allow vanilla commands to be the main version of a command diff --git a/CraftBukkit-Patches/0108-Unfinalize-the-isDisconnected-method-by-bukkit.patch b/CraftBukkit-Patches/0107-Unfinalize-the-isDisconnected-method-by-bukkit.patch similarity index 93% rename from CraftBukkit-Patches/0108-Unfinalize-the-isDisconnected-method-by-bukkit.patch rename to CraftBukkit-Patches/0107-Unfinalize-the-isDisconnected-method-by-bukkit.patch index 520a93f12c..b909ee775d 100644 --- a/CraftBukkit-Patches/0108-Unfinalize-the-isDisconnected-method-by-bukkit.patch +++ b/CraftBukkit-Patches/0107-Unfinalize-the-isDisconnected-method-by-bukkit.patch @@ -1,4 +1,4 @@ -From e04cef687e5499a956f943b80ca1861ca1cac0db Mon Sep 17 00:00:00 2001 +From 63647a3814e0a78e75fa6585c00f746f0f233726 Mon Sep 17 00:00:00 2001 From: hcherndon Date: Sat, 15 Feb 2014 01:51:20 -0600 Subject: [PATCH] Unfinalize the isDisconnected() method by bukkit. diff --git a/CraftBukkit-Patches/0109-Implement-Silenceable-Lightning-API.patch b/CraftBukkit-Patches/0108-Implement-Silenceable-Lightning-API.patch similarity index 98% rename from CraftBukkit-Patches/0109-Implement-Silenceable-Lightning-API.patch rename to CraftBukkit-Patches/0108-Implement-Silenceable-Lightning-API.patch index 697e547511..ebd0073fda 100644 --- a/CraftBukkit-Patches/0109-Implement-Silenceable-Lightning-API.patch +++ b/CraftBukkit-Patches/0108-Implement-Silenceable-Lightning-API.patch @@ -1,4 +1,4 @@ -From 9ca5bcfb6dd388d4ec3eac8e4a2ed8422354626e Mon Sep 17 00:00:00 2001 +From 6903d591ba6c4dd342d6282c71f36502b22381d7 Mon Sep 17 00:00:00 2001 From: drXor Date: Sun, 23 Feb 2014 16:16:59 -0400 Subject: [PATCH] Implement Silenceable Lightning API diff --git a/CraftBukkit-Patches/0110-Normalize-spaces-on-when-reading-a-chat-packet.patch b/CraftBukkit-Patches/0109-Normalize-spaces-on-when-reading-a-chat-packet.patch similarity index 96% rename from CraftBukkit-Patches/0110-Normalize-spaces-on-when-reading-a-chat-packet.patch rename to CraftBukkit-Patches/0109-Normalize-spaces-on-when-reading-a-chat-packet.patch index 83bc70ce01..bf1b80a98b 100644 --- a/CraftBukkit-Patches/0110-Normalize-spaces-on-when-reading-a-chat-packet.patch +++ b/CraftBukkit-Patches/0109-Normalize-spaces-on-when-reading-a-chat-packet.patch @@ -1,4 +1,4 @@ -From 63be1358f86e8a513e9984a7099aa7a793e94bc0 Mon Sep 17 00:00:00 2001 +From ed1c8f0c588306e8594a62d8e45d4ee97fdeef8a Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Wed, 26 Feb 2014 14:45:22 +0000 Subject: [PATCH] Normalize spaces on when reading a chat packet diff --git a/CraftBukkit-Patches/0111-Use-one-PermissibleBase-for-all-Command-Blocks.patch b/CraftBukkit-Patches/0110-Use-one-PermissibleBase-for-all-Command-Blocks.patch similarity index 94% rename from CraftBukkit-Patches/0111-Use-one-PermissibleBase-for-all-Command-Blocks.patch rename to CraftBukkit-Patches/0110-Use-one-PermissibleBase-for-all-Command-Blocks.patch index 52f5fcb67a..81d60f5a3f 100644 --- a/CraftBukkit-Patches/0111-Use-one-PermissibleBase-for-all-Command-Blocks.patch +++ b/CraftBukkit-Patches/0110-Use-one-PermissibleBase-for-all-Command-Blocks.patch @@ -1,4 +1,4 @@ -From ee13d3a98b6256aca458526270c815d20ef678c5 Mon Sep 17 00:00:00 2001 +From 765ffd4a4782b61b8801ad2d288b415970d74967 Mon Sep 17 00:00:00 2001 From: FrozenBrain Date: Sun, 2 Mar 2014 21:13:46 +0100 Subject: [PATCH] Use one PermissibleBase for all Command Blocks diff --git a/CraftBukkit-Patches/0112-Prevent-hoppers-from-loading-chunks.patch b/CraftBukkit-Patches/0111-Prevent-hoppers-from-loading-chunks.patch similarity index 93% rename from CraftBukkit-Patches/0112-Prevent-hoppers-from-loading-chunks.patch rename to CraftBukkit-Patches/0111-Prevent-hoppers-from-loading-chunks.patch index 654e91a31e..4cee6ccd2e 100644 --- a/CraftBukkit-Patches/0112-Prevent-hoppers-from-loading-chunks.patch +++ b/CraftBukkit-Patches/0111-Prevent-hoppers-from-loading-chunks.patch @@ -1,4 +1,4 @@ -From e57e4a58d5d9739a4c0305cb5248930a6ee0d2c7 Mon Sep 17 00:00:00 2001 +From ec9f4a5c28d7e08088a481f5069e524ea203d8c6 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Wed, 5 Mar 2014 20:27:27 +0000 Subject: [PATCH] Prevent hoppers from loading chunks diff --git a/CraftBukkit-Patches/0113-Guard-Entity-List.patch b/CraftBukkit-Patches/0112-Guard-Entity-List.patch similarity index 97% rename from CraftBukkit-Patches/0113-Guard-Entity-List.patch rename to CraftBukkit-Patches/0112-Guard-Entity-List.patch index b79ea80ec7..9e95675afc 100644 --- a/CraftBukkit-Patches/0113-Guard-Entity-List.patch +++ b/CraftBukkit-Patches/0112-Guard-Entity-List.patch @@ -1,4 +1,4 @@ -From 90be9eaab308e864147a8b1d132993ccfa5b0e30 Mon Sep 17 00:00:00 2001 +From e3dcf59a6e012570fea6a7da4aec993c9057a9e2 Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 10 Mar 2014 09:03:28 +1100 Subject: [PATCH] Guard Entity List diff --git a/CraftBukkit-Patches/0114-Fix-ConcurrentModificationException-while-being-idle.patch b/CraftBukkit-Patches/0113-Fix-ConcurrentModificationException-while-being-idle.patch similarity index 96% rename from CraftBukkit-Patches/0114-Fix-ConcurrentModificationException-while-being-idle.patch rename to CraftBukkit-Patches/0113-Fix-ConcurrentModificationException-while-being-idle.patch index a8349df2f0..162cb6a402 100644 --- a/CraftBukkit-Patches/0114-Fix-ConcurrentModificationException-while-being-idle.patch +++ b/CraftBukkit-Patches/0113-Fix-ConcurrentModificationException-while-being-idle.patch @@ -1,4 +1,4 @@ -From f17e7f7d18037ebc7bb2931b4a7d64526abc57d4 Mon Sep 17 00:00:00 2001 +From ae5a874349a9d986d3b30b395ca025ecf90769bf Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Tue, 14 Jan 2014 20:11:25 +0000 Subject: [PATCH] Fix ConcurrentModificationException while being idle kicked diff --git a/CraftBukkit-Patches/0115-Cancellable-WitherSkull-potion-effect.patch b/CraftBukkit-Patches/0114-Cancellable-WitherSkull-potion-effect.patch similarity index 96% rename from CraftBukkit-Patches/0115-Cancellable-WitherSkull-potion-effect.patch rename to CraftBukkit-Patches/0114-Cancellable-WitherSkull-potion-effect.patch index 504f18543a..ee20fa233b 100644 --- a/CraftBukkit-Patches/0115-Cancellable-WitherSkull-potion-effect.patch +++ b/CraftBukkit-Patches/0114-Cancellable-WitherSkull-potion-effect.patch @@ -1,4 +1,4 @@ -From b3c7812bdfe3cfd8d995dbc66c709622306ba3b9 Mon Sep 17 00:00:00 2001 +From 54692bd0ef4f1e11cb9ad5ac2aa62f82de65c297 Mon Sep 17 00:00:00 2001 From: drXor Date: Tue, 25 Feb 2014 15:15:26 -0400 Subject: [PATCH] Cancellable WitherSkull potion effect diff --git a/CraftBukkit-Patches/0116-Optimize-Player-Lookup.patch b/CraftBukkit-Patches/0115-Optimize-Player-Lookup.patch similarity index 98% rename from CraftBukkit-Patches/0116-Optimize-Player-Lookup.patch rename to CraftBukkit-Patches/0115-Optimize-Player-Lookup.patch index 4d78829019..873ec973cb 100644 --- a/CraftBukkit-Patches/0116-Optimize-Player-Lookup.patch +++ b/CraftBukkit-Patches/0115-Optimize-Player-Lookup.patch @@ -1,4 +1,4 @@ -From c72aadfb4ca40278f6c5aec574fbe7e5711b83ca Mon Sep 17 00:00:00 2001 +From a24b5a38ec94a03907c3ef650eb9fb6e32f68b76 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 15 Mar 2014 14:34:03 +1100 Subject: [PATCH] Optimize Player Lookup @@ -165,7 +165,7 @@ index 2645c97..ff13c51 100644 // TODO: In 1.7.6+ this should use the server's UUID->EntityPlayer map diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index d33502a..a2eeb1b 100644 +index 8af4bf7..8b1ffd6 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -101,13 +101,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/CraftBukkit-Patches/0117-Descriptive-kick-reasons-instead-of-Nope.patch b/CraftBukkit-Patches/0116-Descriptive-kick-reasons-instead-of-Nope.patch similarity index 97% rename from CraftBukkit-Patches/0117-Descriptive-kick-reasons-instead-of-Nope.patch rename to CraftBukkit-Patches/0116-Descriptive-kick-reasons-instead-of-Nope.patch index e1d0dd2491..b9c917ad7a 100644 --- a/CraftBukkit-Patches/0117-Descriptive-kick-reasons-instead-of-Nope.patch +++ b/CraftBukkit-Patches/0116-Descriptive-kick-reasons-instead-of-Nope.patch @@ -1,4 +1,4 @@ -From d0650a1956322d53f81772d57e6e0fc1431ddba2 Mon Sep 17 00:00:00 2001 +From 25569e8a05ead051d52f5a545b1554941516c8bd Mon Sep 17 00:00:00 2001 From: drXor Date: Sat, 15 Mar 2014 01:30:05 -0400 Subject: [PATCH] Descriptive kick reasons instead of Nope! diff --git a/CraftBukkit-Patches/0118-Allow-enchanting-tables-to-enchant-any-item.patch b/CraftBukkit-Patches/0117-Allow-enchanting-tables-to-enchant-any-item.patch similarity index 96% rename from CraftBukkit-Patches/0118-Allow-enchanting-tables-to-enchant-any-item.patch rename to CraftBukkit-Patches/0117-Allow-enchanting-tables-to-enchant-any-item.patch index ccb4f03f0f..08b89997cc 100644 --- a/CraftBukkit-Patches/0118-Allow-enchanting-tables-to-enchant-any-item.patch +++ b/CraftBukkit-Patches/0117-Allow-enchanting-tables-to-enchant-any-item.patch @@ -1,4 +1,4 @@ -From 2b720d915f2c4e1fb462bec95695438d6488a11d Mon Sep 17 00:00:00 2001 +From 06daebc4d7b583f854ed3a1913d359d6c9335437 Mon Sep 17 00:00:00 2001 From: andrepl Date: Sat, 15 Mar 2014 12:50:00 -0400 Subject: [PATCH] Allow enchanting tables to enchant any item diff --git a/CraftBukkit-Patches/0119-Remove-the-lastChunkAccessed-if-it-is-unloaded.patch b/CraftBukkit-Patches/0118-Remove-the-lastChunkAccessed-if-it-is-unloaded.patch similarity index 98% rename from CraftBukkit-Patches/0119-Remove-the-lastChunkAccessed-if-it-is-unloaded.patch rename to CraftBukkit-Patches/0118-Remove-the-lastChunkAccessed-if-it-is-unloaded.patch index a618f9bfe5..310123aee6 100644 --- a/CraftBukkit-Patches/0119-Remove-the-lastChunkAccessed-if-it-is-unloaded.patch +++ b/CraftBukkit-Patches/0118-Remove-the-lastChunkAccessed-if-it-is-unloaded.patch @@ -1,4 +1,4 @@ -From 32b284ce20bccabfb267a4b516074071a32270e7 Mon Sep 17 00:00:00 2001 +From 4c278c6fdc194b23a0ed33e9fbd9d94219f66ca1 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Tue, 18 Mar 2014 09:49:30 +0000 Subject: [PATCH] Remove the lastChunkAccessed if it is unloaded. diff --git a/CraftBukkit-Patches/0120-Check-for-manually-prefixed-commands-or-commands-tha.patch b/CraftBukkit-Patches/0119-Check-for-manually-prefixed-commands-or-commands-tha.patch similarity index 95% rename from CraftBukkit-Patches/0120-Check-for-manually-prefixed-commands-or-commands-tha.patch rename to CraftBukkit-Patches/0119-Check-for-manually-prefixed-commands-or-commands-tha.patch index c0a940a19b..c03bf01ae3 100644 --- a/CraftBukkit-Patches/0120-Check-for-manually-prefixed-commands-or-commands-tha.patch +++ b/CraftBukkit-Patches/0119-Check-for-manually-prefixed-commands-or-commands-tha.patch @@ -1,4 +1,4 @@ -From 0eaf4e148ee92f7e6672a8196c83739b8a459280 Mon Sep 17 00:00:00 2001 +From 5201ffe0150fb2e5105e28267978e3efea9e793f Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Sun, 23 Mar 2014 01:12:10 +0000 Subject: [PATCH] Check for manually prefixed commands or commands that don't diff --git a/CraftBukkit-Patches/0121-Cap-window-names-to-prevent-client-disconnects.patch b/CraftBukkit-Patches/0120-Cap-window-names-to-prevent-client-disconnects.patch similarity index 93% rename from CraftBukkit-Patches/0121-Cap-window-names-to-prevent-client-disconnects.patch rename to CraftBukkit-Patches/0120-Cap-window-names-to-prevent-client-disconnects.patch index 8d120e8b2a..5e84800b7a 100644 --- a/CraftBukkit-Patches/0121-Cap-window-names-to-prevent-client-disconnects.patch +++ b/CraftBukkit-Patches/0120-Cap-window-names-to-prevent-client-disconnects.patch @@ -1,4 +1,4 @@ -From a899b5259c3a0cbbc3df4646b21b1a49578bfca0 Mon Sep 17 00:00:00 2001 +From 322c314741c18194c62d033395dbca31b0a2df70 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Sun, 23 Mar 2014 10:53:48 +0000 Subject: [PATCH] Cap window names to prevent client disconnects diff --git a/CraftBukkit-Patches/0122-Enable-Improved-Ping-Sending.patch b/CraftBukkit-Patches/0121-Enable-Improved-Ping-Sending.patch similarity index 97% rename from CraftBukkit-Patches/0122-Enable-Improved-Ping-Sending.patch rename to CraftBukkit-Patches/0121-Enable-Improved-Ping-Sending.patch index 97967c2c67..e88edbbb12 100644 --- a/CraftBukkit-Patches/0122-Enable-Improved-Ping-Sending.patch +++ b/CraftBukkit-Patches/0121-Enable-Improved-Ping-Sending.patch @@ -1,4 +1,4 @@ -From 55f21f861261a6deb713e8eeee6045917dc8a71c Mon Sep 17 00:00:00 2001 +From 09287f47fdadb27dcdc39c6914902d94e0e8f514 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/0123-Prevent-getOfflinePlayer-UUID-on-main-thread.patch b/CraftBukkit-Patches/0122-Prevent-getOfflinePlayer-UUID-on-main-thread.patch similarity index 93% rename from CraftBukkit-Patches/0123-Prevent-getOfflinePlayer-UUID-on-main-thread.patch rename to CraftBukkit-Patches/0122-Prevent-getOfflinePlayer-UUID-on-main-thread.patch index df035c55ec..6cc763aca3 100644 --- a/CraftBukkit-Patches/0123-Prevent-getOfflinePlayer-UUID-on-main-thread.patch +++ b/CraftBukkit-Patches/0122-Prevent-getOfflinePlayer-UUID-on-main-thread.patch @@ -1,4 +1,4 @@ -From 60bd33f0f7cb963b7e6eb8387bbfd8e20a53ba40 Mon Sep 17 00:00:00 2001 +From e64d7c0ca438aa60ac1e545928ba2b0c83f5aa6d Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 30 Mar 2014 09:15:35 +1100 Subject: [PATCH] Prevent getOfflinePlayer(UUID) on main thread. diff --git a/CraftBukkit-Patches/0124-Configurable-dragon-death-and-wither-spawn-sounds.patch b/CraftBukkit-Patches/0123-Configurable-dragon-death-and-wither-spawn-sounds.patch similarity index 98% rename from CraftBukkit-Patches/0124-Configurable-dragon-death-and-wither-spawn-sounds.patch rename to CraftBukkit-Patches/0123-Configurable-dragon-death-and-wither-spawn-sounds.patch index ced9d6a3a4..d8c9ee999d 100644 --- a/CraftBukkit-Patches/0124-Configurable-dragon-death-and-wither-spawn-sounds.patch +++ b/CraftBukkit-Patches/0123-Configurable-dragon-death-and-wither-spawn-sounds.patch @@ -1,4 +1,4 @@ -From 3fbe203218e86fb4f100231f2d01bcb5ecb28a0a Mon Sep 17 00:00:00 2001 +From 67ea2bb8feb99fa189e87a05ff37aff6dff241a0 Mon Sep 17 00:00:00 2001 From: drXor Date: Sat, 29 Mar 2014 13:44:25 -0400 Subject: [PATCH] Configurable dragon death and wither spawn sounds diff --git a/CraftBukkit-Patches/0125-Fix-TileEntities-getting-ticked-after-being-queued-f.patch b/CraftBukkit-Patches/0124-Fix-TileEntities-getting-ticked-after-being-queued-f.patch similarity index 95% rename from CraftBukkit-Patches/0125-Fix-TileEntities-getting-ticked-after-being-queued-f.patch rename to CraftBukkit-Patches/0124-Fix-TileEntities-getting-ticked-after-being-queued-f.patch index dc736fe1b7..780d0176ee 100644 --- a/CraftBukkit-Patches/0125-Fix-TileEntities-getting-ticked-after-being-queued-f.patch +++ b/CraftBukkit-Patches/0124-Fix-TileEntities-getting-ticked-after-being-queued-f.patch @@ -1,4 +1,4 @@ -From 814cd274eba3e544ef80ae68cc23a31fe2a657a4 Mon Sep 17 00:00:00 2001 +From 5d529ca00299e2f3aab97a98aa6975ddc317acd6 Mon Sep 17 00:00:00 2001 From: FrozenBrain Date: Sun, 23 Mar 2014 01:49:13 +0100 Subject: [PATCH] Fix TileEntities getting ticked after being queued for diff --git a/CraftBukkit-Patches/0126-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch b/CraftBukkit-Patches/0125-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch similarity index 92% rename from CraftBukkit-Patches/0126-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch rename to CraftBukkit-Patches/0125-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch index 10823bae52..b4ad11bac8 100644 --- a/CraftBukkit-Patches/0126-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch +++ b/CraftBukkit-Patches/0125-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch @@ -1,4 +1,4 @@ -From d67f62ef765845a19868002ec81a452b95f7ea20 Mon Sep 17 00:00:00 2001 +From e479193f877f9c8b674a2319599843af75e8c539 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Fri, 11 Apr 2014 11:16:34 +0100 Subject: [PATCH] Display 'Spigot' in client crashes, server lists and Mojang