diff --git a/Bukkit-Patches/0002-Spigot-Timings.patch b/Bukkit-Patches/0002-Spigot-Timings.patch index 50746ee..35291d3 100644 --- a/Bukkit-Patches/0002-Spigot-Timings.patch +++ b/Bukkit-Patches/0002-Spigot-Timings.patch @@ -1,4 +1,4 @@ -From 7087e5182440a2bd37ae53dccdfeca2ab0ed11f8 Mon Sep 17 00:00:00 2001 +From 1f187a6f5feeb611db31a38403d521bfb4b50daa Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 2 Jun 2013 10:42:57 +1000 Subject: [PATCH] Spigot Timings @@ -8,7 +8,7 @@ Adds performance tracking timings all around the Minecraft Server, and improves Plugins can track their own timings with CustomTimingsHandler diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 2c43d9e..af5fe07 100644 +index fd7d116..c535498 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -541,6 +541,7 @@ public final class Bukkit { @@ -19,7 +19,7 @@ index 2c43d9e..af5fe07 100644 } /** -@@ -1121,4 +1122,9 @@ public final class Bukkit { +@@ -1124,4 +1125,9 @@ public final class Bukkit { public static UnsafeValues getUnsafe() { return server.getUnsafe(); } @@ -30,10 +30,10 @@ index 2c43d9e..af5fe07 100644 + } } diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index ab6d047..a57d506 100644 +index ca6c42c..2892a28 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -917,4 +917,15 @@ public interface Server extends PluginMessageRecipient { +@@ -920,4 +920,15 @@ public interface Server extends PluginMessageRecipient { */ @Deprecated UnsafeValues getUnsafe(); @@ -98,7 +98,7 @@ index a229d08..a08a49d 100644 } diff --git a/src/main/java/org/bukkit/command/defaults/TimingsCommand.java b/src/main/java/org/bukkit/command/defaults/TimingsCommand.java -index a39ea5d..552dabb 100644 +index a39ea5d..fc59aa3 100644 --- a/src/main/java/org/bukkit/command/defaults/TimingsCommand.java +++ b/src/main/java/org/bukkit/command/defaults/TimingsCommand.java @@ -19,23 +19,101 @@ import org.bukkit.util.StringUtil; @@ -264,7 +264,7 @@ index a39ea5d..552dabb 100644 + // Spigot end } diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java -index d2fe422..1d51908 100644 +index e51658d..1a61ad3 100644 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java @@ -295,6 +295,7 @@ public final class SimplePluginManager implements PluginManager { diff --git a/Bukkit-Patches/0028-BungeeCord-Chat-API.patch b/Bukkit-Patches/0028-BungeeCord-Chat-API.patch index 25775e6..feb9cad 100644 --- a/Bukkit-Patches/0028-BungeeCord-Chat-API.patch +++ b/Bukkit-Patches/0028-BungeeCord-Chat-API.patch @@ -1,4 +1,4 @@ -From 88ea28b160d00ad290a7cb851d25ea324b1b0365 Mon Sep 17 00:00:00 2001 +From e58d48c30fb2fa251e6f386eed2716acdce5f802 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 13 Dec 2014 12:59:14 +1100 Subject: [PATCH] BungeeCord Chat API @@ -24,10 +24,10 @@ index c3b3d47..c90fd6e 100644 junit diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 57b2794..cf4ab1d 100644 +index 52dd005..20edb77 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -916,6 +916,24 @@ public interface Server extends PluginMessageRecipient { +@@ -919,6 +919,24 @@ public interface Server extends PluginMessageRecipient { { throw new UnsupportedOperationException( "Not supported yet." ); } diff --git a/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch b/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch index 78cf4e2..f79032c 100644 --- a/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch +++ b/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch @@ -1,4 +1,4 @@ -From 8169ad820d152c10a26d015417d0070f851c8b9e Mon Sep 17 00:00:00 2001 +From 82f2612342c62a617ed24e51c326de4a07f50b96 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Jun 2013 15:10:56 +1000 Subject: [PATCH] Skeleton API Implementations @@ -6,10 +6,10 @@ Subject: [PATCH] Skeleton API Implementations This contains the basic, empty implementations for some Spigot-API extensions. They are included early in the patching progress so that compilation will still succeed midway despite the APIs only being provided by subsequent patches. diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 629e6b8..4b3fcac 100644 +index 8849087..0b0074d 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1642,4 +1642,14 @@ public final class CraftServer implements Server { +@@ -1638,4 +1638,14 @@ public final class CraftServer implements Server { public UnsafeValues getUnsafe() { return CraftMagicNumbers.INSTANCE; } diff --git a/CraftBukkit-Patches/0005-Spigot-Configuration.patch b/CraftBukkit-Patches/0005-Spigot-Configuration.patch index d1d94fd..6ec1424 100644 --- a/CraftBukkit-Patches/0005-Spigot-Configuration.patch +++ b/CraftBukkit-Patches/0005-Spigot-Configuration.patch @@ -1,4 +1,4 @@ -From f1ff282a5e14c496d23852d8358ff153684cc6a9 Mon Sep 17 00:00:00 2001 +From b4176ca0fac21a90b171b449f00d24ba8f619c24 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 7 Jul 2013 09:32:53 +1000 Subject: [PATCH] Spigot Configuration @@ -55,7 +55,7 @@ index d83842a..0356d9e 100644 this.world = new CraftWorld((WorldServer) this, gen, env); this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 4b3fcac..8668686 100644 +index 0b0074d..37c403d 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -247,8 +247,10 @@ public final class CraftServer implements Server { @@ -71,7 +71,7 @@ index 4b3fcac..8668686 100644 } public boolean getCommandBlockOverride(String command) { -@@ -675,6 +677,7 @@ public final class CraftServer implements Server { +@@ -671,6 +673,7 @@ public final class CraftServer implements Server { logger.log(Level.WARNING, "Failed to load banned-players.json, " + ex.getMessage()); } @@ -79,7 +79,7 @@ index 4b3fcac..8668686 100644 for (WorldServer world : console.worlds) { world.worldData.setDifficulty(difficulty); world.setSpawnFlags(monsters, animals); -@@ -689,11 +692,14 @@ public final class CraftServer implements Server { +@@ -685,11 +688,14 @@ public final class CraftServer implements Server { } else { world.ticksPerMonsterSpawns = this.getTicksPerMonsterSpawns(); } @@ -336,5 +336,5 @@ index 0000000..961ddb4 + } +} -- -1.9.0.msysgit.0 +2.1.4 diff --git a/CraftBukkit-Patches/0009-Async-Operation-Catching.patch b/CraftBukkit-Patches/0009-Async-Operation-Catching.patch index 42de9c2..4f00a3d 100644 --- a/CraftBukkit-Patches/0009-Async-Operation-Catching.patch +++ b/CraftBukkit-Patches/0009-Async-Operation-Catching.patch @@ -1,4 +1,4 @@ -From 9be637512105ef94ff3f673c0cae43bcb199173e Mon Sep 17 00:00:00 2001 +From 82faee6fc499cc962324e115723cac63afacbd07 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 25 Mar 2014 16:10:01 +1100 Subject: [PATCH] Async Operation Catching @@ -78,7 +78,7 @@ index 5ef2be4..8d50e05 100644 this.trackedPlayers.remove(entityplayer); entityplayer.d(this.tracker); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index abc39f1..b4ed484 100644 +index df4d9cd..68f4996 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -940,6 +940,7 @@ public abstract class World implements IBlockAccess { @@ -97,7 +97,7 @@ index abc39f1..b4ed484 100644 entity.die(); if (entity instanceof EntityHuman) { this.players.remove(entity); -@@ -2500,6 +2502,7 @@ public abstract class World implements IBlockAccess { +@@ -2498,6 +2500,7 @@ public abstract class World implements IBlockAccess { } public void b(Collection collection) { diff --git a/CraftBukkit-Patches/0011-Spigot-Timings.patch b/CraftBukkit-Patches/0011-Spigot-Timings.patch index 1fc2237..d5373b8 100644 --- a/CraftBukkit-Patches/0011-Spigot-Timings.patch +++ b/CraftBukkit-Patches/0011-Spigot-Timings.patch @@ -1,4 +1,4 @@ -From be288c6477a833de5710270c85047bd1bb0b2a86 Mon Sep 17 00:00:00 2001 +From 6408d0d5b54887a507042c3d6884fdd91f17e41e Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 10 Jan 2013 00:18:11 -0500 Subject: [PATCH] Spigot Timings @@ -106,7 +106,7 @@ index cfd28f1..ad989e6 100644 // return chunk; // CraftBukkit } diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index 7e440b0..948a2f6 100644 +index 24ecbd2..22d51aa 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -20,6 +20,7 @@ import java.io.PrintStream; @@ -367,7 +367,7 @@ index 4941eed..fe61577 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 8767bc3..794464a 100644 +index bf8edb6..48f7501 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1063,6 +1063,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList @@ -419,7 +419,7 @@ index 513712d..b8d0961 100644 private static Map> f = Maps.newHashMap(); private static Map, String> g = Maps.newHashMap(); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index b4ed484..3e5933a 100644 +index 68f4996..45cafe7 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -21,6 +21,7 @@ import org.bukkit.Bukkit; @@ -583,10 +583,10 @@ index b245159..fba6814 100644 public BiomeBase.BiomeMeta a(EnumCreatureType enumcreaturetype, BlockPosition blockposition) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 2aceeb4..ed0c30c 100644 +index 37c403d..396c034 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1652,6 +1652,11 @@ public final class CraftServer implements Server { +@@ -1648,6 +1648,11 @@ public final class CraftServer implements Server { private final Spigot spigot = new Spigot() { diff --git a/CraftBukkit-Patches/0020-Close-Unloaded-Save-Files.patch b/CraftBukkit-Patches/0020-Close-Unloaded-Save-Files.patch index e78a1e0..b6de087 100644 --- a/CraftBukkit-Patches/0020-Close-Unloaded-Save-Files.patch +++ b/CraftBukkit-Patches/0020-Close-Unloaded-Save-Files.patch @@ -1,4 +1,4 @@ -From b57b4f13248edaddeb6b3be296dca129f51449c3 Mon Sep 17 00:00:00 2001 +From 2e90980ec646629091be3c0caafc8ff8c5a37e69 Mon Sep 17 00:00:00 2001 From: Antony Riley Date: Wed, 27 Mar 2013 01:41:54 +0200 Subject: [PATCH] Close Unloaded Save Files @@ -18,10 +18,10 @@ index b07e7d5..5528019 100644 public static synchronized RegionFile a(File file, int i, int j) { File file1 = new File(file, "region"); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index ed0c30c..58d52d8 100644 +index 396c034..8353b1d 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -967,6 +967,31 @@ public final class CraftServer implements Server { +@@ -963,6 +963,31 @@ public final class CraftServer implements Server { worlds.remove(world.getName().toLowerCase()); console.worlds.remove(console.worlds.indexOf(handle)); diff --git a/CraftBukkit-Patches/0028-Allow-Disabling-of-Command-TabComplete.patch b/CraftBukkit-Patches/0028-Allow-Disabling-of-Command-TabComplete.patch index ba6d0ea..393aa40 100644 --- a/CraftBukkit-Patches/0028-Allow-Disabling-of-Command-TabComplete.patch +++ b/CraftBukkit-Patches/0028-Allow-Disabling-of-Command-TabComplete.patch @@ -1,14 +1,14 @@ -From a8f27533733edea2d3e2672c663c2a00d10ba137 Mon Sep 17 00:00:00 2001 +From 302f7707caca0e35b27ffef542f2047295cb7657 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 21 Jun 2013 18:05:54 +1000 Subject: [PATCH] Allow Disabling of Command TabComplete diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 1a6316d..3d41eb1 100644 +index 8353b1d..465623e 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1571,6 +1571,13 @@ public final class CraftServer implements Server { +@@ -1567,6 +1567,13 @@ public final class CraftServer implements Server { } public List tabCompleteCommand(Player player, String message) { @@ -49,5 +49,5 @@ index 3999f5b..ca001e9 100644 + } } -- -1.9.0.msysgit.0 +2.1.4 diff --git a/CraftBukkit-Patches/0029-Configurable-Messages.patch b/CraftBukkit-Patches/0029-Configurable-Messages.patch index d93cf40..ae9cdf4 100644 --- a/CraftBukkit-Patches/0029-Configurable-Messages.patch +++ b/CraftBukkit-Patches/0029-Configurable-Messages.patch @@ -1,4 +1,4 @@ -From e99ecec40fd58c6b7be7a441e90b6bfa8d445f75 Mon Sep 17 00:00:00 2001 +From 5a66b8f6c5c8f495f0857ffbb58dfd3e47fa5756 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 21 Jun 2013 19:21:58 +1000 Subject: [PATCH] Configurable Messages @@ -45,10 +45,10 @@ index 7918bcb..825823d 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 3d41eb1..1125ff2 100644 +index 465623e..d07b3b8 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -628,11 +628,7 @@ public final class CraftServer implements Server { +@@ -624,11 +624,7 @@ public final class CraftServer implements Server { return true; } @@ -103,5 +103,5 @@ index ca001e9..3726ea5 100644 + } } -- -1.9.0.msysgit.0 +2.1.4 diff --git a/CraftBukkit-Patches/0030-Allow-Disabling-of-Random-Lighting-Updates.patch b/CraftBukkit-Patches/0030-Allow-Disabling-of-Random-Lighting-Updates.patch index 72bb2c6..49e3730 100644 --- a/CraftBukkit-Patches/0030-Allow-Disabling-of-Random-Lighting-Updates.patch +++ b/CraftBukkit-Patches/0030-Allow-Disabling-of-Random-Lighting-Updates.patch @@ -1,4 +1,4 @@ -From aae4390a892c0571a91ddcf978ddf38f6fe257fd Mon Sep 17 00:00:00 2001 +From c2620e0b5e61bb275c6c6f628e66a8d495de1278 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 22 Jun 2013 16:12:02 +1000 Subject: [PATCH] Allow Disabling of Random Lighting Updates @@ -18,10 +18,10 @@ index 3d8d59a..3e72a01 100644 } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index f82c0f9..a08b401 100644 +index 221e2f2..33c4fb0 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -2090,7 +2090,7 @@ public abstract class World implements IBlockAccess { +@@ -2088,7 +2088,7 @@ public abstract class World implements IBlockAccess { } this.methodProfiler.a("playerCheckLight"); diff --git a/CraftBukkit-Patches/0055-BungeeCord-Support.patch b/CraftBukkit-Patches/0055-BungeeCord-Support.patch index b1fa68d..b8bdf7f 100644 --- a/CraftBukkit-Patches/0055-BungeeCord-Support.patch +++ b/CraftBukkit-Patches/0055-BungeeCord-Support.patch @@ -1,4 +1,4 @@ -From 5701be9c3222212075e84275f354ee7a419318ad Mon Sep 17 00:00:00 2001 +From 9919455a6939de744d08eb063e10ba966448d67a Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 1 Dec 2013 18:18:41 +1100 Subject: [PATCH] BungeeCord Support @@ -131,7 +131,7 @@ index cd67d2b..54298b4 100644 + // Spigot End } diff --git a/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java b/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java -index cc5aee0..18d0c6b 100644 +index a1c5869..c91a695 100644 --- a/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java +++ b/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java @@ -13,7 +13,7 @@ public class PacketHandshakingInSetProtocol implements Packet -Date: Thu, 23 Jan 2014 13:17:35 +1100 -Subject: [PATCH] Add Spigot Links - - -diff --git a/README.md b/README.md -index cda766b..1f12a75 100644 ---- a/README.md -+++ b/README.md -@@ -1,11 +1,11 @@ --CraftBukkit -+Spigot - =========== - --A Bukkit (Minecraft Server API) implementation -+A Spigot-API and Bukkit implementation - --Website: [http://bukkit.org](http://bukkit.org) --Bugs/Suggestions: [http://leaky.bukkit.org](http://leaky.bukkit.org) --Contributing Guidelines: [CONTRIBUTING.md](https://github.com/Bukkit/CraftBukkit/blob/master/CONTRIBUTING.md) -+Website: [http://spigotmc.org](http://spigotmc.org) -+Bugs/Suggestions: [http://www.spigotmc.org/forums/bugs-feature-requests.8/](http://www.spigotmc.org/forums/bugs-feature-requests.8/) -+Contributing Guidelines: [CONTRIBUTING.md](https://github.com/SpigotMC/Spigot-API/blob/master/CONTRIBUTING.md) - - Compilation - ----------- -@@ -13,6 +13,6 @@ Compilation - We use maven to handle our dependencies. - - * Install [Maven 3](http://maven.apache.org/download.html) --* Check out and install [Bukkit](http://github.com/Bukkit/Bukkit) -- * *Note*: this is not needed as the repository we use has Bukkit too, but you might have a newer one (with your own changes :D) -+* Check out and install [Spigot-API](http://github.com/SpigotMC/Spigot) -+ * *Note*: this is not needed as the repository we use has Spigot-API too, but you might have a newer one (with your own changes :D) - * Check out this repo and: `mvn clean package` -diff --git a/src/main/resources/configurations/bukkit.yml b/src/main/resources/configurations/bukkit.yml -index a6c1178..6b7ad05 100644 ---- a/src/main/resources/configurations/bukkit.yml -+++ b/src/main/resources/configurations/bukkit.yml -@@ -6,11 +6,10 @@ - # If you need help on this file, feel free to join us on irc or leave a message - # on the forums asking for advice. - # --# IRC: #bukkit @ esper.net --# (If this means nothing to you, just go to http://webchat.esper.net/?channels=bukkit ) --# Forums: http://forums.bukkit.org/forums/bukkit-help.6/ --# Twitter: http://twitter.com/CraftBukkit --# Bug tracker: http://leaky.bukkit.org/ -+# IRC: #spigot @ irc.spi.gt -+# (If this means nothing to you, just go to http://irc.spi.gt/iris/?nick=&channels=spigot ) -+# Forums: http://www.spigotmc.org/forums/help.40/ -+# Bug tracker: http://www.spigotmc.org/forums/bugs-feature-requests.8/ - - - settings: -diff --git a/src/main/resources/configurations/commands.yml b/src/main/resources/configurations/commands.yml -index 0a5d414..d6bcf5c 100644 ---- a/src/main/resources/configurations/commands.yml -+++ b/src/main/resources/configurations/commands.yml -@@ -5,11 +5,10 @@ - # If you need help on this file, feel free to join us on irc or leave a message - # on the forums asking for advice. - # --# IRC: #bukkit @ esper.net --# (If this means nothing to you, just go to http://webchat.esper.net/?channels=bukkit ) --# Forums: http://forums.bukkit.org/forums/bukkit-help.6/ --# Twitter: http://twitter.com/CraftBukkit --# Bug tracker: http://leaky.bukkit.org/ -+# IRC: #spigot @ irc.spi.gt -+# (If this means nothing to you, just go to http://irc.spi.gt/iris/?nick=&channels=spigot ) -+# Forums: http://www.spigotmc.org/forums/help.40/ -+# Bug tracker: http://www.spigotmc.org/forums/bugs-feature-requests.8/ - - command-block-overrides: [] - aliases: --- -2.1.4 - diff --git a/CraftBukkit-Patches/0075-Configurable-Ping-Sample-Size.patch b/CraftBukkit-Patches/0074-Configurable-Ping-Sample-Size.patch similarity index 95% rename from CraftBukkit-Patches/0075-Configurable-Ping-Sample-Size.patch rename to CraftBukkit-Patches/0074-Configurable-Ping-Sample-Size.patch index 9ab9123..dccd06f 100644 --- a/CraftBukkit-Patches/0075-Configurable-Ping-Sample-Size.patch +++ b/CraftBukkit-Patches/0074-Configurable-Ping-Sample-Size.patch @@ -1,4 +1,4 @@ -From ec3323930633149b8ba9aced3bcf62355ee8663f Mon Sep 17 00:00:00 2001 +From b695f1fbcb1480438be8b0bb348aa4a5720bec2c 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 @@ -39,5 +39,5 @@ index e1cc2e0..936c860 100644 + } } -- -1.9.0.msysgit.0 +2.1.4 diff --git a/CraftBukkit-Patches/0076-Add-Optional-Tick-Shuffling.patch b/CraftBukkit-Patches/0075-Add-Optional-Tick-Shuffling.patch similarity index 95% rename from CraftBukkit-Patches/0076-Add-Optional-Tick-Shuffling.patch rename to CraftBukkit-Patches/0075-Add-Optional-Tick-Shuffling.patch index 85a2c4d..c8eb2cf 100644 --- a/CraftBukkit-Patches/0076-Add-Optional-Tick-Shuffling.patch +++ b/CraftBukkit-Patches/0075-Add-Optional-Tick-Shuffling.patch @@ -1,4 +1,4 @@ -From e78650aba2ac8f033e980d8527ecc414d4daef46 Mon Sep 17 00:00:00 2001 +From 04a310edb26da5da81ff3986c868a4e5a2ff961f 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 @@ -39,5 +39,5 @@ index 936c860..83e575f 100644 + } } -- -1.9.0.msysgit.0 +2.1.4 diff --git a/CraftBukkit-Patches/0077-Allow-Configuring-Chunks-per-Packet.patch b/CraftBukkit-Patches/0076-Allow-Configuring-Chunks-per-Packet.patch similarity index 94% rename from CraftBukkit-Patches/0077-Allow-Configuring-Chunks-per-Packet.patch rename to CraftBukkit-Patches/0076-Allow-Configuring-Chunks-per-Packet.patch index f76a0f5..8762324 100644 --- a/CraftBukkit-Patches/0077-Allow-Configuring-Chunks-per-Packet.patch +++ b/CraftBukkit-Patches/0076-Allow-Configuring-Chunks-per-Packet.patch @@ -1,11 +1,11 @@ -From f9f7d2e5c726b6f4f81f66d2683112a3d9f60331 Mon Sep 17 00:00:00 2001 +From 08991837f7535535ebb44db2c53864bf67adceb2 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/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 2fab7d1..b80fd6d 100644 +index 60dc7cd..9f1c122 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -223,7 +223,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/CraftBukkit-Patches/0078-Implement-Locale-Getter-for-Players.patch b/CraftBukkit-Patches/0077-Implement-Locale-Getter-for-Players.patch similarity index 94% rename from CraftBukkit-Patches/0078-Implement-Locale-Getter-for-Players.patch rename to CraftBukkit-Patches/0077-Implement-Locale-Getter-for-Players.patch index c38749f..d17da0c 100644 --- a/CraftBukkit-Patches/0078-Implement-Locale-Getter-for-Players.patch +++ b/CraftBukkit-Patches/0077-Implement-Locale-Getter-for-Players.patch @@ -1,11 +1,11 @@ -From deeeff7aa324e4cd0be1f24621f53839fb8686f3 Mon Sep 17 00:00:00 2001 +From 0cc910792483a90b29cb4b8359d5b4e92c7819cc 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 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index b80fd6d..9447d35 100644 +index 9f1c122..26b4f97 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -27,7 +27,7 @@ import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; diff --git a/CraftBukkit-Patches/0079-Cap-Entity-Collisions.patch b/CraftBukkit-Patches/0078-Cap-Entity-Collisions.patch similarity index 97% rename from CraftBukkit-Patches/0079-Cap-Entity-Collisions.patch rename to CraftBukkit-Patches/0078-Cap-Entity-Collisions.patch index c6b1ed0..90d9427 100644 --- a/CraftBukkit-Patches/0079-Cap-Entity-Collisions.patch +++ b/CraftBukkit-Patches/0078-Cap-Entity-Collisions.patch @@ -1,4 +1,4 @@ -From dd9b7854dc1854fa837a9b9d48d11fe249498e02 Mon Sep 17 00:00:00 2001 +From e8321494f95fcddb4f3f924bc00772d08cf24e56 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/0080-Fix-dispensing-bone-meal-not-having-the-correct-data.patch b/CraftBukkit-Patches/0079-Fix-dispensing-bone-meal-not-having-the-correct-data.patch similarity index 94% rename from CraftBukkit-Patches/0080-Fix-dispensing-bone-meal-not-having-the-correct-data.patch rename to CraftBukkit-Patches/0079-Fix-dispensing-bone-meal-not-having-the-correct-data.patch index 025bbf4..8b85343 100644 --- a/CraftBukkit-Patches/0080-Fix-dispensing-bone-meal-not-having-the-correct-data.patch +++ b/CraftBukkit-Patches/0079-Fix-dispensing-bone-meal-not-having-the-correct-data.patch @@ -1,4 +1,4 @@ -From 558562c999dd7880361be5b35f8669411cfb36b7 Mon Sep 17 00:00:00 2001 +From 6b1405183f0ce15b40b9d7aee6380ad1b228269f 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/0081-Spam-Filter-Exclusions.patch b/CraftBukkit-Patches/0080-Spam-Filter-Exclusions.patch similarity index 95% rename from CraftBukkit-Patches/0081-Spam-Filter-Exclusions.patch rename to CraftBukkit-Patches/0080-Spam-Filter-Exclusions.patch index eb5d8e3..0de7609 100644 --- a/CraftBukkit-Patches/0081-Spam-Filter-Exclusions.patch +++ b/CraftBukkit-Patches/0080-Spam-Filter-Exclusions.patch @@ -1,11 +1,11 @@ -From f9fa84c647a91560542e38d11eb29e77aef42a22 Mon Sep 17 00:00:00 2001 +From 604c62009070a89c50397eb41a1e79c45e373491 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/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 0d45439..f3365ca 100644 +index e23ee8c..7cad158 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -971,9 +971,20 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList @@ -57,5 +57,5 @@ index 83e575f..a0a59bb 100644 + } } -- -1.9.0.msysgit.0 +2.1.4 diff --git a/CraftBukkit-Patches/0082-Add-Option-to-Silence-CommandBlock-Console.patch b/CraftBukkit-Patches/0081-Add-Option-to-Silence-CommandBlock-Console.patch similarity index 94% rename from CraftBukkit-Patches/0082-Add-Option-to-Silence-CommandBlock-Console.patch rename to CraftBukkit-Patches/0081-Add-Option-to-Silence-CommandBlock-Console.patch index 2fcab03..9461e2d 100644 --- a/CraftBukkit-Patches/0082-Add-Option-to-Silence-CommandBlock-Console.patch +++ b/CraftBukkit-Patches/0081-Add-Option-to-Silence-CommandBlock-Console.patch @@ -1,4 +1,4 @@ -From 100bb30d9a6782b30d1d86f92a3aeb344043a6c4 Mon Sep 17 00:00:00 2001 +From a387d2b20493a62b91b18f5df24873c09bea4c1c 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 @@ -33,5 +33,5 @@ index a0a59bb..039777a 100644 + } } -- -1.9.0.msysgit.0 +2.1.4 diff --git a/CraftBukkit-Patches/0083-Add-support-for-fetching-hidden-players.patch b/CraftBukkit-Patches/0082-Add-support-for-fetching-hidden-players.patch similarity index 93% rename from CraftBukkit-Patches/0083-Add-support-for-fetching-hidden-players.patch rename to CraftBukkit-Patches/0082-Add-support-for-fetching-hidden-players.patch index 38921f0..00c5dda 100644 --- a/CraftBukkit-Patches/0083-Add-support-for-fetching-hidden-players.patch +++ b/CraftBukkit-Patches/0082-Add-support-for-fetching-hidden-players.patch @@ -1,4 +1,4 @@ -From 20ae0e2f740dee6e185b8369ffdb580035df77af Mon Sep 17 00:00:00 2001 +From b4c4146c8beb2026e888d7da839d0b9df083b627 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/CraftBukkit-Patches/0084-Allow-Disabling-Creative-Item-Filter.patch b/CraftBukkit-Patches/0083-Allow-Disabling-Creative-Item-Filter.patch similarity index 94% rename from CraftBukkit-Patches/0084-Allow-Disabling-Creative-Item-Filter.patch rename to CraftBukkit-Patches/0083-Allow-Disabling-Creative-Item-Filter.patch index fdefb65..7d65e19 100644 --- a/CraftBukkit-Patches/0084-Allow-Disabling-Creative-Item-Filter.patch +++ b/CraftBukkit-Patches/0083-Allow-Disabling-Creative-Item-Filter.patch @@ -1,11 +1,11 @@ -From 9da1e626cbaf538b8c10fbef36303da60347ca45 Mon Sep 17 00:00:00 2001 +From 6667d6da0ff7e8e34a1b00c76ec30eebd5451c2d 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/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index f3365ca..f40c7c9 100644 +index 7cad158..add3c88 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1697,7 +1697,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList @@ -33,5 +33,5 @@ index 039777a..686b8bd 100644 + } } -- -1.9.0.msysgit.0 +2.1.4 diff --git a/CraftBukkit-Patches/0085-Cap-Channel-Registrations.patch b/CraftBukkit-Patches/0084-Cap-Channel-Registrations.patch similarity index 92% rename from CraftBukkit-Patches/0085-Cap-Channel-Registrations.patch rename to CraftBukkit-Patches/0084-Cap-Channel-Registrations.patch index f36cc06..39c2b97 100644 --- a/CraftBukkit-Patches/0085-Cap-Channel-Registrations.patch +++ b/CraftBukkit-Patches/0084-Cap-Channel-Registrations.patch @@ -1,4 +1,4 @@ -From 3522fd55c5aae8cee3851fc5a114b3a8b77c409c Mon Sep 17 00:00:00 2001 +From 66bc41490b7841ea522b2efabbc98c37ab31fa86 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/CraftBukkit-Patches/0086-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch b/CraftBukkit-Patches/0085-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch similarity index 96% rename from CraftBukkit-Patches/0086-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch rename to CraftBukkit-Patches/0085-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch index e83ed5d..cd552c8 100644 --- a/CraftBukkit-Patches/0086-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch +++ b/CraftBukkit-Patches/0085-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch @@ -1,11 +1,11 @@ -From b901732728a8974b6154dd30e117c2b0a0f1a9cf Mon Sep 17 00:00:00 2001 +From 23d9a2a95c127eeae2eed8925f40c7c374f81ddc 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/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 04e2f70..4200f7d 100644 +index 2801b5c..f828b35 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -317,8 +317,11 @@ public final class CraftServer implements Server { @@ -76,5 +76,5 @@ index 686b8bd..3a8734f 100644 + } } -- -1.9.0.msysgit.0 +2.1.4 diff --git a/CraftBukkit-Patches/0087-Unfinalize-the-isDisconnected-method-by-bukkit.patch b/CraftBukkit-Patches/0086-Unfinalize-the-isDisconnected-method-by-bukkit.patch similarity index 90% rename from CraftBukkit-Patches/0087-Unfinalize-the-isDisconnected-method-by-bukkit.patch rename to CraftBukkit-Patches/0086-Unfinalize-the-isDisconnected-method-by-bukkit.patch index 03e0bfe..daeeb11 100644 --- a/CraftBukkit-Patches/0087-Unfinalize-the-isDisconnected-method-by-bukkit.patch +++ b/CraftBukkit-Patches/0086-Unfinalize-the-isDisconnected-method-by-bukkit.patch @@ -1,4 +1,4 @@ -From 10f8d30f1edd380dbd27ee2ba67cd21d2f9e0203 Mon Sep 17 00:00:00 2001 +From f7af7562a24c4e18e0326390ecbe995ff26c1cc0 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. @@ -6,7 +6,7 @@ Subject: [PATCH] Unfinalize the isDisconnected() method by bukkit. This would literally mean the world to me. You have no idea how much this method being final is fucking me over right now. (Working with NPC's and what not.) diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index f40c7c9..a357d57 100644 +index add3c88..d8f5480 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -2059,7 +2059,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList diff --git a/CraftBukkit-Patches/0088-Implement-Silenceable-Lightning-API.patch b/CraftBukkit-Patches/0087-Implement-Silenceable-Lightning-API.patch similarity index 98% rename from CraftBukkit-Patches/0088-Implement-Silenceable-Lightning-API.patch rename to CraftBukkit-Patches/0087-Implement-Silenceable-Lightning-API.patch index 5d0b2a8..5883f78 100644 --- a/CraftBukkit-Patches/0088-Implement-Silenceable-Lightning-API.patch +++ b/CraftBukkit-Patches/0087-Implement-Silenceable-Lightning-API.patch @@ -1,4 +1,4 @@ -From e8405d7ec0d4d78f12d725388bab9a340478934f Mon Sep 17 00:00:00 2001 +From 7dca647cde6af64bce68379982822bd9046224f4 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/0089-Use-one-PermissibleBase-for-all-Command-Blocks.patch b/CraftBukkit-Patches/0088-Use-one-PermissibleBase-for-all-Command-Blocks.patch similarity index 94% rename from CraftBukkit-Patches/0089-Use-one-PermissibleBase-for-all-Command-Blocks.patch rename to CraftBukkit-Patches/0088-Use-one-PermissibleBase-for-all-Command-Blocks.patch index f14291e..ed483f8 100644 --- a/CraftBukkit-Patches/0089-Use-one-PermissibleBase-for-all-Command-Blocks.patch +++ b/CraftBukkit-Patches/0088-Use-one-PermissibleBase-for-all-Command-Blocks.patch @@ -1,4 +1,4 @@ -From 0f64e52709dc745b10ee7508a85aa29c0bc13f93 Mon Sep 17 00:00:00 2001 +From 3bb29ea67ea6cc2e752763d14e452962b2cca604 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/0090-Prevent-hoppers-from-loading-chunks.patch b/CraftBukkit-Patches/0089-Prevent-hoppers-from-loading-chunks.patch similarity index 93% rename from CraftBukkit-Patches/0090-Prevent-hoppers-from-loading-chunks.patch rename to CraftBukkit-Patches/0089-Prevent-hoppers-from-loading-chunks.patch index b43afc2..68abfac 100644 --- a/CraftBukkit-Patches/0090-Prevent-hoppers-from-loading-chunks.patch +++ b/CraftBukkit-Patches/0089-Prevent-hoppers-from-loading-chunks.patch @@ -1,4 +1,4 @@ -From 25cfc35dd3feae24765c75a864ee7492535ca09a Mon Sep 17 00:00:00 2001 +From 5a64bf6b0f0e421fd67c3f3d568eb85ff3402cd0 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/0091-Guard-Entity-List.patch b/CraftBukkit-Patches/0090-Guard-Entity-List.patch similarity index 96% rename from CraftBukkit-Patches/0091-Guard-Entity-List.patch rename to CraftBukkit-Patches/0090-Guard-Entity-List.patch index d000d68..7f6059b 100644 --- a/CraftBukkit-Patches/0091-Guard-Entity-List.patch +++ b/CraftBukkit-Patches/0090-Guard-Entity-List.patch @@ -1,11 +1,11 @@ -From c3658266f9bd8d5329b301f27e7d7247ab3db559 Mon Sep 17 00:00:00 2001 +From a75a61c64252e390a6d81c8288537becee9a748f 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/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 9867081..94481dc 100644 +index b1a9125..dd0b347 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -37,7 +37,32 @@ public abstract class World implements IBlockAccess { diff --git a/CraftBukkit-Patches/0092-Fix-ConcurrentModificationException-while-being-idle.patch b/CraftBukkit-Patches/0091-Fix-ConcurrentModificationException-while-being-idle.patch similarity index 90% rename from CraftBukkit-Patches/0092-Fix-ConcurrentModificationException-while-being-idle.patch rename to CraftBukkit-Patches/0091-Fix-ConcurrentModificationException-while-being-idle.patch index d42daf7..5a4d58f 100644 --- a/CraftBukkit-Patches/0092-Fix-ConcurrentModificationException-while-being-idle.patch +++ b/CraftBukkit-Patches/0091-Fix-ConcurrentModificationException-while-being-idle.patch @@ -1,4 +1,4 @@ -From c429811218fb9a028c5e08c3b31710cfb59bbb9b Mon Sep 17 00:00:00 2001 +From f30bc46839bc5d173791365409c15f9eff964b73 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 @@ -6,7 +6,7 @@ Subject: [PATCH] Fix ConcurrentModificationException while being idle kicked diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 94481dc..6dc0f2e 100644 +index dd0b347..6297c05 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1093,6 +1093,7 @@ public abstract class World implements IBlockAccess { diff --git a/CraftBukkit-Patches/0093-Cancellable-WitherSkull-potion-effect.patch b/CraftBukkit-Patches/0092-Cancellable-WitherSkull-potion-effect.patch similarity index 96% rename from CraftBukkit-Patches/0093-Cancellable-WitherSkull-potion-effect.patch rename to CraftBukkit-Patches/0092-Cancellable-WitherSkull-potion-effect.patch index c097a39..a140ffe 100644 --- a/CraftBukkit-Patches/0093-Cancellable-WitherSkull-potion-effect.patch +++ b/CraftBukkit-Patches/0092-Cancellable-WitherSkull-potion-effect.patch @@ -1,4 +1,4 @@ -From 04650485c0f44261f9e40f7c2b9f7848dedefdcd Mon Sep 17 00:00:00 2001 +From 117b6c8ef2d4cefe3d01a0885529fcb7812edabe 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/0094-Descriptive-kick-reasons-instead-of-Nope.patch b/CraftBukkit-Patches/0093-Descriptive-kick-reasons-instead-of-Nope.patch similarity index 96% rename from CraftBukkit-Patches/0094-Descriptive-kick-reasons-instead-of-Nope.patch rename to CraftBukkit-Patches/0093-Descriptive-kick-reasons-instead-of-Nope.patch index 8c62698..f524924 100644 --- a/CraftBukkit-Patches/0094-Descriptive-kick-reasons-instead-of-Nope.patch +++ b/CraftBukkit-Patches/0093-Descriptive-kick-reasons-instead-of-Nope.patch @@ -1,4 +1,4 @@ -From 2cb578d10684374acb4ecb61e03a7e49da5ea7d8 Mon Sep 17 00:00:00 2001 +From 4d46e3a6accb1e69517023ab23de974ef27fcc48 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! @@ -27,7 +27,7 @@ index 82accf4..d6bef0b 100644 f1 = 0; } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index a357d57..ceb2419 100644 +index d8f5480..7eb563b 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -894,7 +894,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList diff --git a/CraftBukkit-Patches/0095-Configurable-dragon-death-and-wither-spawn-sounds.patch b/CraftBukkit-Patches/0094-Configurable-dragon-death-and-wither-spawn-sounds.patch similarity index 96% rename from CraftBukkit-Patches/0095-Configurable-dragon-death-and-wither-spawn-sounds.patch rename to CraftBukkit-Patches/0094-Configurable-dragon-death-and-wither-spawn-sounds.patch index d772d43..6ece334 100644 --- a/CraftBukkit-Patches/0095-Configurable-dragon-death-and-wither-spawn-sounds.patch +++ b/CraftBukkit-Patches/0094-Configurable-dragon-death-and-wither-spawn-sounds.patch @@ -1,11 +1,11 @@ -From 1b3d31d6cc4fe8c84ad9f1ea8a61a48dbec3e4de Mon Sep 17 00:00:00 2001 +From 09effea3cc351eff455eb60541c74b30eff06ce5 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/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java -index d4ec5fb..fcddd26 100644 +index 657acd7..a64c488 100644 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java @@ -578,6 +578,7 @@ public class EntityEnderDragon extends EntityInsentient implements IComplex, IMo diff --git a/CraftBukkit-Patches/0096-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch b/CraftBukkit-Patches/0095-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch similarity index 92% rename from CraftBukkit-Patches/0096-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch rename to CraftBukkit-Patches/0095-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch index aaade37..d85c469 100644 --- a/CraftBukkit-Patches/0096-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch +++ b/CraftBukkit-Patches/0095-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch @@ -1,4 +1,4 @@ -From ffe56e4a984cbf1a3b75e77c7d11aadee79e4e8e Mon Sep 17 00:00:00 2001 +From d2a36ea752f95c598cbf22c415461d2c8c019cba 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 diff --git a/CraftBukkit-Patches/0097-Treat-Bungee-as-Online-Mode.patch b/CraftBukkit-Patches/0096-Treat-Bungee-as-Online-Mode.patch similarity index 93% rename from CraftBukkit-Patches/0097-Treat-Bungee-as-Online-Mode.patch rename to CraftBukkit-Patches/0096-Treat-Bungee-as-Online-Mode.patch index 938c73b..bb15063 100644 --- a/CraftBukkit-Patches/0097-Treat-Bungee-as-Online-Mode.patch +++ b/CraftBukkit-Patches/0096-Treat-Bungee-as-Online-Mode.patch @@ -1,4 +1,4 @@ -From e6c8db61471487f373de9bfc6f0fd186874270bb Mon Sep 17 00:00:00 2001 +From 826e45f3227d0a35f276a9326b43582a981b9732 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 12 Apr 2014 21:23:58 +1000 Subject: [PATCH] Treat Bungee as Online Mode diff --git a/CraftBukkit-Patches/0098-Add-Conversion-Message.patch b/CraftBukkit-Patches/0097-Add-Conversion-Message.patch similarity index 88% rename from CraftBukkit-Patches/0098-Add-Conversion-Message.patch rename to CraftBukkit-Patches/0097-Add-Conversion-Message.patch index ee65408..759b41d 100644 --- a/CraftBukkit-Patches/0098-Add-Conversion-Message.patch +++ b/CraftBukkit-Patches/0097-Add-Conversion-Message.patch @@ -1,11 +1,11 @@ -From dcc4abd6ded05fe6c4cb62a84112e793b7dfcf9c Mon Sep 17 00:00:00 2001 +From a51267288e950cc85d7272fafe50ec4dcd3ae364 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 12 Apr 2014 23:30:44 +1000 Subject: [PATCH] Add Conversion Message diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index def9dea..76cc16d 100644 +index b7f2382..ad4e370 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -516,6 +516,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer diff --git a/CraftBukkit-Patches/0099-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch b/CraftBukkit-Patches/0098-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch similarity index 94% rename from CraftBukkit-Patches/0099-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch rename to CraftBukkit-Patches/0098-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch index d2863f7..f123282 100644 --- a/CraftBukkit-Patches/0099-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch +++ b/CraftBukkit-Patches/0098-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch @@ -1,4 +1,4 @@ -From a24497fba9dd2ad33cb2df29260da3b752bdad00 Mon Sep 17 00:00:00 2001 +From 72ac162291ff2d760b2315b46dfabd86db855f93 Mon Sep 17 00:00:00 2001 From: "gjmcferrin@gmail.com" Date: Mon, 10 Feb 2014 10:05:11 -0500 Subject: [PATCH] Properly cancel fishing event. Fixes BUKKIT-5396 diff --git a/CraftBukkit-Patches/0100-Print-Stack-on-InternalException.patch b/CraftBukkit-Patches/0099-Print-Stack-on-InternalException.patch similarity index 92% rename from CraftBukkit-Patches/0100-Print-Stack-on-InternalException.patch rename to CraftBukkit-Patches/0099-Print-Stack-on-InternalException.patch index 387dcb0..d93590e 100644 --- a/CraftBukkit-Patches/0100-Print-Stack-on-InternalException.patch +++ b/CraftBukkit-Patches/0099-Print-Stack-on-InternalException.patch @@ -1,4 +1,4 @@ -From 05caf5119e25b4a9d2192a3af26af8df9528ef5d Mon Sep 17 00:00:00 2001 +From f45fdd895f2eced413cae4adf271c4983ebd8473 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 13 Apr 2014 09:00:59 +1000 Subject: [PATCH] Print Stack on InternalException diff --git a/CraftBukkit-Patches/0101-Use-Offline-Player-Data-Once-if-Required.patch b/CraftBukkit-Patches/0100-Use-Offline-Player-Data-Once-if-Required.patch similarity index 96% rename from CraftBukkit-Patches/0101-Use-Offline-Player-Data-Once-if-Required.patch rename to CraftBukkit-Patches/0100-Use-Offline-Player-Data-Once-if-Required.patch index 10be233..9519386 100644 --- a/CraftBukkit-Patches/0101-Use-Offline-Player-Data-Once-if-Required.patch +++ b/CraftBukkit-Patches/0100-Use-Offline-Player-Data-Once-if-Required.patch @@ -1,4 +1,4 @@ -From 1964974bd4ebb400169b5e41af330ca0a9f7eb33 Mon Sep 17 00:00:00 2001 +From 9f634b85d230ef4a9d556742500fcfaffe39e07c Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 13 Apr 2014 14:41:23 +1000 Subject: [PATCH] Use Offline Player Data Once if Required. diff --git a/CraftBukkit-Patches/0102-Use-Provided-Case-for-Non-Existent-Offline-Players.patch b/CraftBukkit-Patches/0101-Use-Provided-Case-for-Non-Existent-Offline-Players.patch similarity index 93% rename from CraftBukkit-Patches/0102-Use-Provided-Case-for-Non-Existent-Offline-Players.patch rename to CraftBukkit-Patches/0101-Use-Provided-Case-for-Non-Existent-Offline-Players.patch index e9a5872..a7e24f4 100644 --- a/CraftBukkit-Patches/0102-Use-Provided-Case-for-Non-Existent-Offline-Players.patch +++ b/CraftBukkit-Patches/0101-Use-Provided-Case-for-Non-Existent-Offline-Players.patch @@ -1,4 +1,4 @@ -From 2a33ccd140c05c3df0e88c5d6fd37db64bcd5744 Mon Sep 17 00:00:00 2001 +From ba6978c2eaea333f2d89093c01d186703bf0dc1e Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 14 Apr 2014 09:46:20 +1000 Subject: [PATCH] Use Provided Case for Non Existent Offline Players diff --git a/CraftBukkit-Patches/0103-Check-for-blank-OfflinePlayer-Names.patch b/CraftBukkit-Patches/0102-Check-for-blank-OfflinePlayer-Names.patch similarity index 84% rename from CraftBukkit-Patches/0103-Check-for-blank-OfflinePlayer-Names.patch rename to CraftBukkit-Patches/0102-Check-for-blank-OfflinePlayer-Names.patch index 23ab356..d5cb098 100644 --- a/CraftBukkit-Patches/0103-Check-for-blank-OfflinePlayer-Names.patch +++ b/CraftBukkit-Patches/0102-Check-for-blank-OfflinePlayer-Names.patch @@ -1,14 +1,14 @@ -From 6040e3cc1f18d33204f22bc7ed04681264943f0f Mon Sep 17 00:00:00 2001 +From 30e4478bc9e5219a4d2869546172e79bb0de2607 Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 14 Apr 2014 17:21:24 +1000 Subject: [PATCH] Check for blank OfflinePlayer Names diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 238e282..982d95e 100644 +index f828b35..15985f9 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1291,6 +1291,7 @@ public final class CraftServer implements Server { +@@ -1287,6 +1287,7 @@ public final class CraftServer implements Server { @Deprecated public OfflinePlayer getOfflinePlayer(String name) { Validate.notNull(name, "Name cannot be null"); diff --git a/CraftBukkit-Patches/0104-Fix-Player-Banning.patch b/CraftBukkit-Patches/0103-Fix-Player-Banning.patch similarity index 96% rename from CraftBukkit-Patches/0104-Fix-Player-Banning.patch rename to CraftBukkit-Patches/0103-Fix-Player-Banning.patch index 7fbeba6..14852b3 100644 --- a/CraftBukkit-Patches/0104-Fix-Player-Banning.patch +++ b/CraftBukkit-Patches/0103-Fix-Player-Banning.patch @@ -1,4 +1,4 @@ -From ab7bcf8f475fd2b65a2c8b65c6bcdda0ab4850eb Mon Sep 17 00:00:00 2001 +From 359688020a0c13607febe5a647a701fa71c27aca Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 15 Apr 2014 10:32:48 +1000 Subject: [PATCH] Fix Player Banning diff --git a/CraftBukkit-Patches/0105-Fix-ban-expire-dates.patch b/CraftBukkit-Patches/0104-Fix-ban-expire-dates.patch similarity index 92% rename from CraftBukkit-Patches/0105-Fix-ban-expire-dates.patch rename to CraftBukkit-Patches/0104-Fix-ban-expire-dates.patch index 43c1668..97f48eb 100644 --- a/CraftBukkit-Patches/0105-Fix-ban-expire-dates.patch +++ b/CraftBukkit-Patches/0104-Fix-ban-expire-dates.patch @@ -1,4 +1,4 @@ -From 1c46986e7612da9922567b5a1486996ae48d68ad Mon Sep 17 00:00:00 2001 +From 963b1a860fa5763f1089ab83e04f1de267cb3c06 Mon Sep 17 00:00:00 2001 From: md_5 Date: Wed, 16 Apr 2014 10:09:56 +1000 Subject: [PATCH] Fix ban expire dates. diff --git a/CraftBukkit-Patches/0106-Correct-Ban-Expiration.patch b/CraftBukkit-Patches/0105-Correct-Ban-Expiration.patch similarity index 93% rename from CraftBukkit-Patches/0106-Correct-Ban-Expiration.patch rename to CraftBukkit-Patches/0105-Correct-Ban-Expiration.patch index fca0e2a..e177d7d 100644 --- a/CraftBukkit-Patches/0106-Correct-Ban-Expiration.patch +++ b/CraftBukkit-Patches/0105-Correct-Ban-Expiration.patch @@ -1,4 +1,4 @@ -From 3266fc204c9523dca5fe661412a1ab62567b5d2c Mon Sep 17 00:00:00 2001 +From 9e7b109a9a6c03c264f2a6aefcf00cf7cb71778a Mon Sep 17 00:00:00 2001 From: md_5 Date: Wed, 16 Apr 2014 11:14:38 +1000 Subject: [PATCH] Correct Ban Expiration diff --git a/CraftBukkit-Patches/0107-Convert-Horses-owner-to-UUID.patch b/CraftBukkit-Patches/0106-Convert-Horses-owner-to-UUID.patch similarity index 94% rename from CraftBukkit-Patches/0107-Convert-Horses-owner-to-UUID.patch rename to CraftBukkit-Patches/0106-Convert-Horses-owner-to-UUID.patch index 79503fe..32cab69 100644 --- a/CraftBukkit-Patches/0107-Convert-Horses-owner-to-UUID.patch +++ b/CraftBukkit-Patches/0106-Convert-Horses-owner-to-UUID.patch @@ -1,4 +1,4 @@ -From 4352457fa5237fa677dba605114cf42919315a55 Mon Sep 17 00:00:00 2001 +From 517e5c21efe83837102eb110d9375f073c981a74 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 16 Apr 2014 01:40:30 -0400 Subject: [PATCH] Convert Horses owner to UUID diff --git a/CraftBukkit-Patches/0108-Add-Score.isScoreSet-Z-API.patch b/CraftBukkit-Patches/0107-Add-Score.isScoreSet-Z-API.patch similarity index 93% rename from CraftBukkit-Patches/0108-Add-Score.isScoreSet-Z-API.patch rename to CraftBukkit-Patches/0107-Add-Score.isScoreSet-Z-API.patch index 50f4484..b4795fa 100644 --- a/CraftBukkit-Patches/0108-Add-Score.isScoreSet-Z-API.patch +++ b/CraftBukkit-Patches/0107-Add-Score.isScoreSet-Z-API.patch @@ -1,4 +1,4 @@ -From ac591808f6b285a545b202209f99a23d208b9af7 Mon Sep 17 00:00:00 2001 +From 509720e9c0cbc5792b8fc8ba1e7f460eeb57133a Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 17 Apr 2014 19:35:53 +1000 Subject: [PATCH] Add Score.isScoreSet()Z API. diff --git a/CraftBukkit-Patches/0109-Log-null-TileEntity-Owner.patch b/CraftBukkit-Patches/0108-Log-null-TileEntity-Owner.patch similarity index 95% rename from CraftBukkit-Patches/0109-Log-null-TileEntity-Owner.patch rename to CraftBukkit-Patches/0108-Log-null-TileEntity-Owner.patch index e653cd4..dcd31c5 100644 --- a/CraftBukkit-Patches/0109-Log-null-TileEntity-Owner.patch +++ b/CraftBukkit-Patches/0108-Log-null-TileEntity-Owner.patch @@ -1,4 +1,4 @@ -From 7c561ed9b8e1e17a67195e93442bfbc39f7cf2a4 Mon Sep 17 00:00:00 2001 +From 0ceed1d335bb351dc9f27ca0882e993284f88949 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 20 Apr 2014 11:16:54 +1000 Subject: [PATCH] Log null TileEntity Owner diff --git a/CraftBukkit-Patches/0110-Don-t-special-case-invalid-usernames-for-UUIDs.patch b/CraftBukkit-Patches/0109-Don-t-special-case-invalid-usernames-for-UUIDs.patch similarity index 86% rename from CraftBukkit-Patches/0110-Don-t-special-case-invalid-usernames-for-UUIDs.patch rename to CraftBukkit-Patches/0109-Don-t-special-case-invalid-usernames-for-UUIDs.patch index 2c78687..2cfb9da 100644 --- a/CraftBukkit-Patches/0110-Don-t-special-case-invalid-usernames-for-UUIDs.patch +++ b/CraftBukkit-Patches/0109-Don-t-special-case-invalid-usernames-for-UUIDs.patch @@ -1,14 +1,14 @@ -From d54f1555b93868d463296dc1a252a59810b1c3f0 Mon Sep 17 00:00:00 2001 +From ae9f7a8aaa697405394ce50dd8a75824715a72fb Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 20 Apr 2014 18:58:00 +1000 Subject: [PATCH] Don't special case 'invalid' usernames for UUIDs. diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 438f4b1..da6c5cb 100644 +index 15985f9..fddfb24 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1293,11 +1293,6 @@ public final class CraftServer implements Server { +@@ -1289,11 +1289,6 @@ public final class CraftServer implements Server { Validate.notNull(name, "Name cannot be null"); com.google.common.base.Preconditions.checkArgument( !org.apache.commons.lang.StringUtils.isBlank( name ), "Name cannot be blank" ); // Spigot diff --git a/CraftBukkit-Patches/0111-Convert-player-skulls-async.patch b/CraftBukkit-Patches/0110-Convert-player-skulls-async.patch similarity index 99% rename from CraftBukkit-Patches/0111-Convert-player-skulls-async.patch rename to CraftBukkit-Patches/0110-Convert-player-skulls-async.patch index 1938921..6d677b4 100644 --- a/CraftBukkit-Patches/0111-Convert-player-skulls-async.patch +++ b/CraftBukkit-Patches/0110-Convert-player-skulls-async.patch @@ -1,4 +1,4 @@ -From a5b4204aa8f6ce756b0b068039fdd9d901efc6e5 Mon Sep 17 00:00:00 2001 +From 524df75c18f1dba8751a524c38b90704debf2661 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Sun, 20 Apr 2014 13:18:55 +0100 Subject: [PATCH] Convert player skulls async diff --git a/CraftBukkit-Patches/0112-Prevent-NoClassDefError-crash-and-notify-on-crash.patch b/CraftBukkit-Patches/0111-Prevent-NoClassDefError-crash-and-notify-on-crash.patch similarity index 96% rename from CraftBukkit-Patches/0112-Prevent-NoClassDefError-crash-and-notify-on-crash.patch rename to CraftBukkit-Patches/0111-Prevent-NoClassDefError-crash-and-notify-on-crash.patch index 7569a09..035bb63 100644 --- a/CraftBukkit-Patches/0112-Prevent-NoClassDefError-crash-and-notify-on-crash.patch +++ b/CraftBukkit-Patches/0111-Prevent-NoClassDefError-crash-and-notify-on-crash.patch @@ -1,11 +1,11 @@ -From 39df267e1372fcfc297c1506f49fd3dc73a7651a Mon Sep 17 00:00:00 2001 +From dcce3af6ec0b9997c1cb7b62a8eac55e860c3d13 Mon Sep 17 00:00:00 2001 From: David Date: Mon, 21 Apr 2014 12:43:08 +0100 Subject: [PATCH] Prevent NoClassDefError crash and notify on crash diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 6dc0f2e..6e78b47 100644 +index 6297c05..b4d6e0b 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -135,6 +135,8 @@ public abstract class World implements IBlockAccess { diff --git a/CraftBukkit-Patches/0113-Check-Skull-canPlace.patch b/CraftBukkit-Patches/0112-Check-Skull-canPlace.patch similarity index 93% rename from CraftBukkit-Patches/0113-Check-Skull-canPlace.patch rename to CraftBukkit-Patches/0112-Check-Skull-canPlace.patch index 6723032..44efac7 100644 --- a/CraftBukkit-Patches/0113-Check-Skull-canPlace.patch +++ b/CraftBukkit-Patches/0112-Check-Skull-canPlace.patch @@ -1,4 +1,4 @@ -From 2c50d97a886dfdfd30bb45ff6483d7fbd79d3495 Mon Sep 17 00:00:00 2001 +From 58c3f180077e0acae70e5144bf8a1b4324835a38 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 15 Apr 2014 10:48:35 +1000 Subject: [PATCH] Check Skull canPlace diff --git a/CraftBukkit-Patches/0114-Fix-race-condition-that-could-kill-connections-befor.patch b/CraftBukkit-Patches/0113-Fix-race-condition-that-could-kill-connections-befor.patch similarity index 97% rename from CraftBukkit-Patches/0114-Fix-race-condition-that-could-kill-connections-befor.patch rename to CraftBukkit-Patches/0113-Fix-race-condition-that-could-kill-connections-befor.patch index b35f230..24323fb 100644 --- a/CraftBukkit-Patches/0114-Fix-race-condition-that-could-kill-connections-befor.patch +++ b/CraftBukkit-Patches/0113-Fix-race-condition-that-could-kill-connections-befor.patch @@ -1,4 +1,4 @@ -From a84dfc81793602b69c1e24a72937e151155a1204 Mon Sep 17 00:00:00 2001 +From 5d56c6de0519ca6a91ff18eb341aa3d276b07ec9 Mon Sep 17 00:00:00 2001 From: Jonas Konrad Date: Fri, 25 Apr 2014 23:46:46 +0200 Subject: [PATCH] Fix race condition that could kill connections before they diff --git a/CraftBukkit-Patches/0115-Configurable-UserCache-cap.patch b/CraftBukkit-Patches/0114-Configurable-UserCache-cap.patch similarity index 95% rename from CraftBukkit-Patches/0115-Configurable-UserCache-cap.patch rename to CraftBukkit-Patches/0114-Configurable-UserCache-cap.patch index 17ee257..010110a 100644 --- a/CraftBukkit-Patches/0115-Configurable-UserCache-cap.patch +++ b/CraftBukkit-Patches/0114-Configurable-UserCache-cap.patch @@ -1,4 +1,4 @@ -From 8210134dc306c57f0531eb450e462d9a16a77e3f Mon Sep 17 00:00:00 2001 +From b5eadd0d98e88009babf5263ebe4b344b22a685e Mon Sep 17 00:00:00 2001 From: drXor Date: Fri, 25 Apr 2014 18:17:30 -0400 Subject: [PATCH] Configurable UserCache cap diff --git a/CraftBukkit-Patches/0116-Implement-PlayerSpawnLocationEvent.patch b/CraftBukkit-Patches/0115-Implement-PlayerSpawnLocationEvent.patch similarity index 96% rename from CraftBukkit-Patches/0116-Implement-PlayerSpawnLocationEvent.patch rename to CraftBukkit-Patches/0115-Implement-PlayerSpawnLocationEvent.patch index de414f3..53a87d8 100644 --- a/CraftBukkit-Patches/0116-Implement-PlayerSpawnLocationEvent.patch +++ b/CraftBukkit-Patches/0115-Implement-PlayerSpawnLocationEvent.patch @@ -1,4 +1,4 @@ -From d291a5cfd2bc9cde7bfa23f9824f114db775a7f0 Mon Sep 17 00:00:00 2001 +From ee05d4ad6bea5b604c4577c2f46e319078df1510 Mon Sep 17 00:00:00 2001 From: ninja Date: Tue, 8 Apr 2014 14:05:19 +0200 Subject: [PATCH] Implement PlayerSpawnLocationEvent. diff --git a/CraftBukkit-Patches/0117-Cap-Objective-Score-Length.patch b/CraftBukkit-Patches/0116-Cap-Objective-Score-Length.patch similarity index 94% rename from CraftBukkit-Patches/0117-Cap-Objective-Score-Length.patch rename to CraftBukkit-Patches/0116-Cap-Objective-Score-Length.patch index 320ee7a..b4db4ab 100644 --- a/CraftBukkit-Patches/0117-Cap-Objective-Score-Length.patch +++ b/CraftBukkit-Patches/0116-Cap-Objective-Score-Length.patch @@ -1,4 +1,4 @@ -From a3c6e0bcb50f802a87947e916c20c3bd92394128 Mon Sep 17 00:00:00 2001 +From d413ec0d01767b3a079b36776733faedf1a0d7fa Mon Sep 17 00:00:00 2001 From: hauno Date: Tue, 6 May 2014 18:01:37 -0700 Subject: [PATCH] Cap Objective Score Length diff --git a/CraftBukkit-Patches/0118-Process-conversation-input-on-the-main-thread.-Fixes.patch b/CraftBukkit-Patches/0117-Process-conversation-input-on-the-main-thread.-Fixes.patch similarity index 95% rename from CraftBukkit-Patches/0118-Process-conversation-input-on-the-main-thread.-Fixes.patch rename to CraftBukkit-Patches/0117-Process-conversation-input-on-the-main-thread.-Fixes.patch index f7d50b0..ffc3ef3 100644 --- a/CraftBukkit-Patches/0118-Process-conversation-input-on-the-main-thread.-Fixes.patch +++ b/CraftBukkit-Patches/0117-Process-conversation-input-on-the-main-thread.-Fixes.patch @@ -1,4 +1,4 @@ -From 0fdd332d639bb8d0a5e446d8297520e50198672c Mon Sep 17 00:00:00 2001 +From 3e89e455b100207f1f954e13ab8f89d7c2e98dcb Mon Sep 17 00:00:00 2001 From: riking Date: Wed, 14 May 2014 13:46:48 -0700 Subject: [PATCH] Process conversation input on the main thread. Fixes diff --git a/CraftBukkit-Patches/0119-Configurable-save-on-stop-only-for-UserCache.patch b/CraftBukkit-Patches/0118-Configurable-save-on-stop-only-for-UserCache.patch similarity index 96% rename from CraftBukkit-Patches/0119-Configurable-save-on-stop-only-for-UserCache.patch rename to CraftBukkit-Patches/0118-Configurable-save-on-stop-only-for-UserCache.patch index f756716..16b3b73 100644 --- a/CraftBukkit-Patches/0119-Configurable-save-on-stop-only-for-UserCache.patch +++ b/CraftBukkit-Patches/0118-Configurable-save-on-stop-only-for-UserCache.patch @@ -1,4 +1,4 @@ -From d2a17f5a8a4ca417760ffd6be8bf1ec5c706e42f Mon Sep 17 00:00:00 2001 +From 433f59925459c87ae5711d9a064ac3b7a17e8965 Mon Sep 17 00:00:00 2001 From: drXor Date: Fri, 23 May 2014 18:05:10 -0400 Subject: [PATCH] Configurable save-on-stop-only for UserCache diff --git a/CraftBukkit-Patches/0120-Prevent-Unbounded-IntCache-Growth.patch b/CraftBukkit-Patches/0119-Prevent-Unbounded-IntCache-Growth.patch similarity index 97% rename from CraftBukkit-Patches/0120-Prevent-Unbounded-IntCache-Growth.patch rename to CraftBukkit-Patches/0119-Prevent-Unbounded-IntCache-Growth.patch index b2e1999..ff0fdcf 100644 --- a/CraftBukkit-Patches/0120-Prevent-Unbounded-IntCache-Growth.patch +++ b/CraftBukkit-Patches/0119-Prevent-Unbounded-IntCache-Growth.patch @@ -1,4 +1,4 @@ -From 3734c70c6d00a8ac38bca565d58632634d4b59eb Mon Sep 17 00:00:00 2001 +From 6dd5472073fb56eba68a93234a29554851049350 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 20 Jun 2014 19:40:00 +1000 Subject: [PATCH] Prevent Unbounded IntCache Growth diff --git a/CraftBukkit-Patches/0121-Add-damager-to-the-unhandled-error.patch b/CraftBukkit-Patches/0120-Add-damager-to-the-unhandled-error.patch similarity index 97% rename from CraftBukkit-Patches/0121-Add-damager-to-the-unhandled-error.patch rename to CraftBukkit-Patches/0120-Add-damager-to-the-unhandled-error.patch index c167daa..4ed349a 100644 --- a/CraftBukkit-Patches/0121-Add-damager-to-the-unhandled-error.patch +++ b/CraftBukkit-Patches/0120-Add-damager-to-the-unhandled-error.patch @@ -1,4 +1,4 @@ -From 9f01e09fbee1a13e09d0f1673d54bd811a0df602 Mon Sep 17 00:00:00 2001 +From 8d2e6642d47cb5e8aea7ff40fdfbb03698b9a07a Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Thu, 26 Jun 2014 23:42:52 +0100 Subject: [PATCH] Add damager to the unhandled error diff --git a/CraftBukkit-Patches/0122-Cross-World-Entity-Teleportation.patch b/CraftBukkit-Patches/0121-Cross-World-Entity-Teleportation.patch similarity index 95% rename from CraftBukkit-Patches/0122-Cross-World-Entity-Teleportation.patch rename to CraftBukkit-Patches/0121-Cross-World-Entity-Teleportation.patch index 383b155..27e479c 100644 --- a/CraftBukkit-Patches/0122-Cross-World-Entity-Teleportation.patch +++ b/CraftBukkit-Patches/0121-Cross-World-Entity-Teleportation.patch @@ -1,4 +1,4 @@ -From ca15a3af0bedf9fe18d1e5a96f6ae96d634f9d82 Mon Sep 17 00:00:00 2001 +From 0f5edd78e296a9dcc6bde38e6018235de78f8984 Mon Sep 17 00:00:00 2001 From: Andrew Krieger Date: Tue, 24 Dec 2013 07:55:23 -0800 Subject: [PATCH] Cross World Entity Teleportation diff --git a/CraftBukkit-Patches/0123-Limit-block-placement-interaction-packets.patch b/CraftBukkit-Patches/0122-Limit-block-placement-interaction-packets.patch similarity index 98% rename from CraftBukkit-Patches/0123-Limit-block-placement-interaction-packets.patch rename to CraftBukkit-Patches/0122-Limit-block-placement-interaction-packets.patch index 0390013..8d3c3ce 100644 --- a/CraftBukkit-Patches/0123-Limit-block-placement-interaction-packets.patch +++ b/CraftBukkit-Patches/0122-Limit-block-placement-interaction-packets.patch @@ -1,4 +1,4 @@ -From 35ce22ac6fc7b882a7beddf9e63b98b503816c35 Mon Sep 17 00:00:00 2001 +From b0893293463044447ddf36e23a571026dd0ba404 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Sun, 29 Jun 2014 21:10:34 +0100 Subject: [PATCH] Limit block placement/interaction packets diff --git a/CraftBukkit-Patches/0124-Better-item-validation.patch b/CraftBukkit-Patches/0123-Better-item-validation.patch similarity index 99% rename from CraftBukkit-Patches/0124-Better-item-validation.patch rename to CraftBukkit-Patches/0123-Better-item-validation.patch index 18c6bcb..c4c17bb 100644 --- a/CraftBukkit-Patches/0124-Better-item-validation.patch +++ b/CraftBukkit-Patches/0123-Better-item-validation.patch @@ -1,4 +1,4 @@ -From 6a97359cf5acd2a387fce2f4f40bd85b5fa11ac8 Mon Sep 17 00:00:00 2001 +From 9f4a6bdc6acd7aea362eb840ac4293d6fe21c27d Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Wed, 2 Jul 2014 23:35:51 +0100 Subject: [PATCH] Better item validation diff --git a/CraftBukkit-Patches/0125-Further-Seed-Customisation.patch b/CraftBukkit-Patches/0124-Further-Seed-Customisation.patch similarity index 97% rename from CraftBukkit-Patches/0125-Further-Seed-Customisation.patch rename to CraftBukkit-Patches/0124-Further-Seed-Customisation.patch index cd424a9..c4b2140 100644 --- a/CraftBukkit-Patches/0125-Further-Seed-Customisation.patch +++ b/CraftBukkit-Patches/0124-Further-Seed-Customisation.patch @@ -1,4 +1,4 @@ -From f7c49aaa0a88a5678bd4aa6b27d5cfa7cfc1e775 Mon Sep 17 00:00:00 2001 +From 4a8222673596ec7fb6fa2b3332b1cb4687b3a446 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 4 Jul 2014 13:28:45 +1000 Subject: [PATCH] Further Seed Customisation diff --git a/CraftBukkit-Patches/0126-Disable-ResourceLeakDetector.patch b/CraftBukkit-Patches/0125-Disable-ResourceLeakDetector.patch similarity index 93% rename from CraftBukkit-Patches/0126-Disable-ResourceLeakDetector.patch rename to CraftBukkit-Patches/0125-Disable-ResourceLeakDetector.patch index 2066808..d8aadef 100644 --- a/CraftBukkit-Patches/0126-Disable-ResourceLeakDetector.patch +++ b/CraftBukkit-Patches/0125-Disable-ResourceLeakDetector.patch @@ -1,4 +1,4 @@ -From 6e91742926a10865ffbfe599df58ab11b97c1ff4 Mon Sep 17 00:00:00 2001 +From 53c1dc26f89eaf98fdc232bedc546731db54a673 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 8 Jul 2014 09:01:50 +1000 Subject: [PATCH] Disable ResourceLeakDetector diff --git a/CraftBukkit-Patches/0127-Add-More-Information-to-session.lock-Errors.patch b/CraftBukkit-Patches/0126-Add-More-Information-to-session.lock-Errors.patch similarity index 96% rename from CraftBukkit-Patches/0127-Add-More-Information-to-session.lock-Errors.patch rename to CraftBukkit-Patches/0126-Add-More-Information-to-session.lock-Errors.patch index a411c02..9f41c2f 100644 --- a/CraftBukkit-Patches/0127-Add-More-Information-to-session.lock-Errors.patch +++ b/CraftBukkit-Patches/0126-Add-More-Information-to-session.lock-Errors.patch @@ -1,4 +1,4 @@ -From 7bf14ededcffd1ec98669c90ce86a6d79d30d29c Mon Sep 17 00:00:00 2001 +From 27bceaa4a4b264ed8ef1b2b6b19946dc966b8e37 Mon Sep 17 00:00:00 2001 From: Suddenly Date: Sat, 5 Jul 2014 16:56:44 +0100 Subject: [PATCH] Add More Information to session.lock Errors diff --git a/CraftBukkit-Patches/0128-Safer-JSON-Loading.patch b/CraftBukkit-Patches/0127-Safer-JSON-Loading.patch similarity index 97% rename from CraftBukkit-Patches/0128-Safer-JSON-Loading.patch rename to CraftBukkit-Patches/0127-Safer-JSON-Loading.patch index eb7b5a5..b176abf 100644 --- a/CraftBukkit-Patches/0128-Safer-JSON-Loading.patch +++ b/CraftBukkit-Patches/0127-Safer-JSON-Loading.patch @@ -1,4 +1,4 @@ -From 266eddeec4ac76df87e382808330cb2fb95c77d9 Mon Sep 17 00:00:00 2001 +From 831e476e4c5996de7479fe9ab5967758f42f61fa Mon Sep 17 00:00:00 2001 From: Suddenly Date: Tue, 8 Jul 2014 09:44:18 +1000 Subject: [PATCH] Safer JSON Loading diff --git a/CraftBukkit-Patches/0129-Fix-Slow-Loading-Libraries.patch b/CraftBukkit-Patches/0128-Fix-Slow-Loading-Libraries.patch similarity index 90% rename from CraftBukkit-Patches/0129-Fix-Slow-Loading-Libraries.patch rename to CraftBukkit-Patches/0128-Fix-Slow-Loading-Libraries.patch index 7a9997e..b0a46af 100644 --- a/CraftBukkit-Patches/0129-Fix-Slow-Loading-Libraries.patch +++ b/CraftBukkit-Patches/0128-Fix-Slow-Loading-Libraries.patch @@ -1,4 +1,4 @@ -From 507611b0cee04c9555cc42dc4cee770e1019c1a4 Mon Sep 17 00:00:00 2001 +From ee3f1329e4aa23d669a253d8ab748298e1f001f6 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 8 Jul 2014 20:27:52 +1000 Subject: [PATCH] Fix Slow "Loading Libraries" diff --git a/CraftBukkit-Patches/0130-Add-CommandLine-EULA-Flag.patch b/CraftBukkit-Patches/0129-Add-CommandLine-EULA-Flag.patch similarity index 96% rename from CraftBukkit-Patches/0130-Add-CommandLine-EULA-Flag.patch rename to CraftBukkit-Patches/0129-Add-CommandLine-EULA-Flag.patch index 8460a8c..b708024 100644 --- a/CraftBukkit-Patches/0130-Add-CommandLine-EULA-Flag.patch +++ b/CraftBukkit-Patches/0129-Add-CommandLine-EULA-Flag.patch @@ -1,4 +1,4 @@ -From 249f0a660eafaf4b0df4b8684a4b5d1778d74df0 Mon Sep 17 00:00:00 2001 +From dc9bf7b99878861b221c5ec7208d8fd15cf07259 Mon Sep 17 00:00:00 2001 From: md_5 Date: Wed, 9 Jul 2014 10:35:44 +1000 Subject: [PATCH] Add CommandLine EULA Flag diff --git a/CraftBukkit-Patches/0131-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch b/CraftBukkit-Patches/0130-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch similarity index 94% rename from CraftBukkit-Patches/0131-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch rename to CraftBukkit-Patches/0130-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch index 065881b..5ace7b8 100644 --- a/CraftBukkit-Patches/0131-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch +++ b/CraftBukkit-Patches/0130-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch @@ -1,4 +1,4 @@ -From ca5124acaa38d7d01b316301270ca6db84551ee3 Mon Sep 17 00:00:00 2001 +From 844afeb670e1b8cced149f5b343669bfef9ababc Mon Sep 17 00:00:00 2001 From: drXor Date: Thu, 17 Jul 2014 21:13:15 -0400 Subject: [PATCH] Fix for enchanting table wiping meta when placing stacked diff --git a/CraftBukkit-Patches/0132-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch b/CraftBukkit-Patches/0131-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch similarity index 96% rename from CraftBukkit-Patches/0132-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch rename to CraftBukkit-Patches/0131-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch index 00c78da..d11a889 100644 --- a/CraftBukkit-Patches/0132-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch +++ b/CraftBukkit-Patches/0131-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch @@ -1,4 +1,4 @@ -From c26fbc5b08948719bb930de97d5dd4099c599b0e Mon Sep 17 00:00:00 2001 +From 3e2a02539c547a3dfbab7666902681d5b0afbe4a Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Sat, 19 Jul 2014 12:49:48 +0100 Subject: [PATCH] Don't spawn bonus ocelots when plugins spawn ocelots diff --git a/CraftBukkit-Patches/0133-Prevent-a-crash-involving-attributes.patch b/CraftBukkit-Patches/0132-Prevent-a-crash-involving-attributes.patch similarity index 95% rename from CraftBukkit-Patches/0133-Prevent-a-crash-involving-attributes.patch rename to CraftBukkit-Patches/0132-Prevent-a-crash-involving-attributes.patch index 4b02a2f..85a069f 100644 --- a/CraftBukkit-Patches/0133-Prevent-a-crash-involving-attributes.patch +++ b/CraftBukkit-Patches/0132-Prevent-a-crash-involving-attributes.patch @@ -1,4 +1,4 @@ -From af60d408c86a2a7cd143b9175e7ee7fcfaf41b19 Mon Sep 17 00:00:00 2001 +From 7ba036ae3caf4ace3b69fbce3b09a1a9a0914e35 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Sat, 19 Jul 2014 19:54:41 +0100 Subject: [PATCH] Prevent a crash involving attributes diff --git a/CraftBukkit-Patches/0134-Make-moved-wrongly-limit-configurable.patch b/CraftBukkit-Patches/0133-Make-moved-wrongly-limit-configurable.patch similarity index 96% rename from CraftBukkit-Patches/0134-Make-moved-wrongly-limit-configurable.patch rename to CraftBukkit-Patches/0133-Make-moved-wrongly-limit-configurable.patch index 75d77d6..3416f1d 100644 --- a/CraftBukkit-Patches/0134-Make-moved-wrongly-limit-configurable.patch +++ b/CraftBukkit-Patches/0133-Make-moved-wrongly-limit-configurable.patch @@ -1,4 +1,4 @@ -From 2a051abfaab23203d7db975a4041842f2b333b5e Mon Sep 17 00:00:00 2001 +From f6780bc97b1cbc9978014f36a98b6b86aabfd962 Mon Sep 17 00:00:00 2001 From: Jonas Konrad Date: Fri, 4 Jul 2014 23:03:13 +0200 Subject: [PATCH] Make "moved wrongly" limit configurable diff --git a/CraftBukkit-Patches/0135-Fix-Null-Tile-Entity-Worlds.patch b/CraftBukkit-Patches/0134-Fix-Null-Tile-Entity-Worlds.patch similarity index 87% rename from CraftBukkit-Patches/0135-Fix-Null-Tile-Entity-Worlds.patch rename to CraftBukkit-Patches/0134-Fix-Null-Tile-Entity-Worlds.patch index 6ad976a..ff184c2 100644 --- a/CraftBukkit-Patches/0135-Fix-Null-Tile-Entity-Worlds.patch +++ b/CraftBukkit-Patches/0134-Fix-Null-Tile-Entity-Worlds.patch @@ -1,11 +1,11 @@ -From ceb7ce10626fb3d88fc647028c559741065ae96c Mon Sep 17 00:00:00 2001 +From 1c3789b83f01eb6c0d1ee5d4fd021310896a505a Mon Sep 17 00:00:00 2001 From: "Evan A. Haskell" Date: Thu, 26 Jun 2014 18:37:29 -0400 Subject: [PATCH] Fix Null Tile Entity Worlds diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 6e78b47..464b243 100644 +index b4d6e0b..d1beb67 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1946,6 +1946,7 @@ public abstract class World implements IBlockAccess { diff --git a/CraftBukkit-Patches/0136-Make-moved-too-quickly-limit-configurable.patch b/CraftBukkit-Patches/0135-Make-moved-too-quickly-limit-configurable.patch similarity index 97% rename from CraftBukkit-Patches/0136-Make-moved-too-quickly-limit-configurable.patch rename to CraftBukkit-Patches/0135-Make-moved-too-quickly-limit-configurable.patch index 26c93a3..3a16eb4 100644 --- a/CraftBukkit-Patches/0136-Make-moved-too-quickly-limit-configurable.patch +++ b/CraftBukkit-Patches/0135-Make-moved-too-quickly-limit-configurable.patch @@ -1,4 +1,4 @@ -From 73512ac0ebfd34e1366b62c6f01fdc72cd41a2ed Mon Sep 17 00:00:00 2001 +From bbf233abd32c15cf9fc7a04f9f2fadc4268b767c Mon Sep 17 00:00:00 2001 From: Jonas Konrad Date: Tue, 22 Jul 2014 15:59:01 +0200 Subject: [PATCH] Make "moved too quickly" limit configurable diff --git a/CraftBukkit-Patches/0137-Apply-NBTReadLimiter-to-more-things.patch b/CraftBukkit-Patches/0136-Apply-NBTReadLimiter-to-more-things.patch similarity index 97% rename from CraftBukkit-Patches/0137-Apply-NBTReadLimiter-to-more-things.patch rename to CraftBukkit-Patches/0136-Apply-NBTReadLimiter-to-more-things.patch index 01ed4ca..a81f575 100644 --- a/CraftBukkit-Patches/0137-Apply-NBTReadLimiter-to-more-things.patch +++ b/CraftBukkit-Patches/0136-Apply-NBTReadLimiter-to-more-things.patch @@ -1,4 +1,4 @@ -From 7f8d4077e958e3f5218b6a7862145e2e3eef9d17 Mon Sep 17 00:00:00 2001 +From 861f27394c887f77a7bd70a9bacc57465bbb797b Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 27 Jul 2014 20:46:04 +1000 Subject: [PATCH] Apply NBTReadLimiter to more things. diff --git a/CraftBukkit-Patches/0138-Allow-Attribute-Capping.patch b/CraftBukkit-Patches/0137-Allow-Attribute-Capping.patch similarity index 98% rename from CraftBukkit-Patches/0138-Allow-Attribute-Capping.patch rename to CraftBukkit-Patches/0137-Allow-Attribute-Capping.patch index db5503b..1d9f177 100644 --- a/CraftBukkit-Patches/0138-Allow-Attribute-Capping.patch +++ b/CraftBukkit-Patches/0137-Allow-Attribute-Capping.patch @@ -1,4 +1,4 @@ -From 2cff55cc3cbe16d2294702ba3c99d7528f6cff0d Mon Sep 17 00:00:00 2001 +From 21246e4781f48b4bd323d98cb06b83090bd20b1d Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 28 Jul 2014 16:55:51 +1000 Subject: [PATCH] Allow Attribute Capping. diff --git a/CraftBukkit-Patches/0139-Only-fetch-an-online-UUID-in-online-mode.patch b/CraftBukkit-Patches/0138-Only-fetch-an-online-UUID-in-online-mode.patch similarity index 91% rename from CraftBukkit-Patches/0139-Only-fetch-an-online-UUID-in-online-mode.patch rename to CraftBukkit-Patches/0138-Only-fetch-an-online-UUID-in-online-mode.patch index 1f68a8f..051b078 100644 --- a/CraftBukkit-Patches/0139-Only-fetch-an-online-UUID-in-online-mode.patch +++ b/CraftBukkit-Patches/0138-Only-fetch-an-online-UUID-in-online-mode.patch @@ -1,4 +1,4 @@ -From 1ab114d800f336de3b605b40172b5bc3fcc91c2e Mon Sep 17 00:00:00 2001 +From a0b1ec213579d149b1699edf159e94bf1e920d5a Mon Sep 17 00:00:00 2001 From: Maxim Van de Wynckel Date: Wed, 30 Jul 2014 01:19:51 +0200 Subject: [PATCH] Only fetch an online UUID in online mode @@ -12,10 +12,10 @@ You want to store data for player "Test" who never joined. An online UUID is cr The player Test joins with an offline UUID but that will not match the online UUID of the saved data. diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index da6c5cb..10fc305 100644 +index fddfb24..050c188 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1295,8 +1295,14 @@ public final class CraftServer implements Server { +@@ -1291,8 +1291,14 @@ public final class CraftServer implements Server { OfflinePlayer result = getPlayerExact(name); if (result == null) { diff --git a/CraftBukkit-Patches/0140-Filter-attribute-modifiers-which-cause-the-attribute.patch b/CraftBukkit-Patches/0139-Filter-attribute-modifiers-which-cause-the-attribute.patch similarity index 99% rename from CraftBukkit-Patches/0140-Filter-attribute-modifiers-which-cause-the-attribute.patch rename to CraftBukkit-Patches/0139-Filter-attribute-modifiers-which-cause-the-attribute.patch index 5fcc342..cc90cf5 100644 --- a/CraftBukkit-Patches/0140-Filter-attribute-modifiers-which-cause-the-attribute.patch +++ b/CraftBukkit-Patches/0139-Filter-attribute-modifiers-which-cause-the-attribute.patch @@ -1,4 +1,4 @@ -From 7af8a95d81cc9659e6482da246054ff8b48d42ab Mon Sep 17 00:00:00 2001 +From a28c379683f1d90d8890fcdf7a9d4b392c7471d8 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Thu, 31 Jul 2014 17:48:20 +0100 Subject: [PATCH] Filter attribute modifiers which cause the attribute to go diff --git a/CraftBukkit-Patches/0141-Plug-WorldMap-Memory-Leak.patch b/CraftBukkit-Patches/0140-Plug-WorldMap-Memory-Leak.patch similarity index 96% rename from CraftBukkit-Patches/0141-Plug-WorldMap-Memory-Leak.patch rename to CraftBukkit-Patches/0140-Plug-WorldMap-Memory-Leak.patch index 4664310..544ac4e 100644 --- a/CraftBukkit-Patches/0141-Plug-WorldMap-Memory-Leak.patch +++ b/CraftBukkit-Patches/0140-Plug-WorldMap-Memory-Leak.patch @@ -1,4 +1,4 @@ -From 4deba65347bce03f23bd62f6d69f177c7caabb99 Mon Sep 17 00:00:00 2001 +From e9bf5839e1d74f13665aaf6caef5be41f5206db0 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 8 Aug 2014 19:57:03 +1000 Subject: [PATCH] Plug WorldMap Memory Leak @@ -18,7 +18,7 @@ index 4b8d548..451f481 100644 public PersistentCollection(IDataManager idatamanager) { diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 464b243..2c947ca 100644 +index d1beb67..675d747 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1084,6 +1084,23 @@ public abstract class World implements IBlockAccess { diff --git a/CraftBukkit-Patches/0142-Fix-Corrupted-Trapped-Chest.patch b/CraftBukkit-Patches/0141-Fix-Corrupted-Trapped-Chest.patch similarity index 94% rename from CraftBukkit-Patches/0142-Fix-Corrupted-Trapped-Chest.patch rename to CraftBukkit-Patches/0141-Fix-Corrupted-Trapped-Chest.patch index 8deca55..614c9c4 100644 --- a/CraftBukkit-Patches/0142-Fix-Corrupted-Trapped-Chest.patch +++ b/CraftBukkit-Patches/0141-Fix-Corrupted-Trapped-Chest.patch @@ -1,4 +1,4 @@ -From bdd75a89d6001123b5457b1770569f5d5a0e3091 Mon Sep 17 00:00:00 2001 +From 9a71849acefdb6696f404aaabe4f25543958fd3f Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 15 Aug 2014 00:56:41 -0400 Subject: [PATCH] Fix Corrupted Trapped Chest diff --git a/CraftBukkit-Patches/0143-Remove-uneeded-validation.patch b/CraftBukkit-Patches/0142-Remove-uneeded-validation.patch similarity index 96% rename from CraftBukkit-Patches/0143-Remove-uneeded-validation.patch rename to CraftBukkit-Patches/0142-Remove-uneeded-validation.patch index 3afcfbd..5fddd27 100644 --- a/CraftBukkit-Patches/0143-Remove-uneeded-validation.patch +++ b/CraftBukkit-Patches/0142-Remove-uneeded-validation.patch @@ -1,4 +1,4 @@ -From 5b9920bf88e687ddfbd902c5e47f1babe2c96ddf Mon Sep 17 00:00:00 2001 +From 4d8c56ece612c40c92703ebd4a00ca84ed3859e4 Mon Sep 17 00:00:00 2001 From: drXor Date: Fri, 15 Aug 2014 18:11:09 -0400 Subject: [PATCH] Remove uneeded validation diff --git a/CraftBukkit-Patches/0144-Add-Hunger-Config-Values.patch b/CraftBukkit-Patches/0143-Add-Hunger-Config-Values.patch similarity index 97% rename from CraftBukkit-Patches/0144-Add-Hunger-Config-Values.patch rename to CraftBukkit-Patches/0143-Add-Hunger-Config-Values.patch index 9dd4e33..22a44b6 100644 --- a/CraftBukkit-Patches/0144-Add-Hunger-Config-Values.patch +++ b/CraftBukkit-Patches/0143-Add-Hunger-Config-Values.patch @@ -1,4 +1,4 @@ -From 6942f56ca7f6970335aebd05da24b5d59e8b67ca Mon Sep 17 00:00:00 2001 +From 6602ece5a20bf90d8b724daaeac85179849c4419 Mon Sep 17 00:00:00 2001 From: lazertester Date: Sun, 17 Aug 2014 19:56:17 +1000 Subject: [PATCH] Add Hunger Config Values diff --git a/CraftBukkit-Patches/0145-Make-debug-logging-togglable.patch b/CraftBukkit-Patches/0144-Make-debug-logging-togglable.patch similarity index 97% rename from CraftBukkit-Patches/0145-Make-debug-logging-togglable.patch rename to CraftBukkit-Patches/0144-Make-debug-logging-togglable.patch index 943a7df..37aa4b0 100644 --- a/CraftBukkit-Patches/0145-Make-debug-logging-togglable.patch +++ b/CraftBukkit-Patches/0144-Make-debug-logging-togglable.patch @@ -1,4 +1,4 @@ -From e878de3e7c56bf3fe6d09451e184478f9deb064a Mon Sep 17 00:00:00 2001 +From 50c4dc270b2f15a45658f140d5b38f5ca40bc402 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Sun, 17 Aug 2014 12:42:53 +0200 Subject: [PATCH] Make debug logging togglable. diff --git a/CraftBukkit-Patches/0146-Skip-invalid-enchants-in-CraftMetaItem.patch b/CraftBukkit-Patches/0145-Skip-invalid-enchants-in-CraftMetaItem.patch similarity index 95% rename from CraftBukkit-Patches/0146-Skip-invalid-enchants-in-CraftMetaItem.patch rename to CraftBukkit-Patches/0145-Skip-invalid-enchants-in-CraftMetaItem.patch index 611bb69..51a11a2 100644 --- a/CraftBukkit-Patches/0146-Skip-invalid-enchants-in-CraftMetaItem.patch +++ b/CraftBukkit-Patches/0145-Skip-invalid-enchants-in-CraftMetaItem.patch @@ -1,4 +1,4 @@ -From 184a03dfc5e9be08e2f8f2ff6f008c0abde7545d Mon Sep 17 00:00:00 2001 +From ee04746a77b82b2b9e053135849a2700536315a8 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Tue, 19 Aug 2014 11:04:21 +0100 Subject: [PATCH] Skip invalid enchants in CraftMetaItem diff --git a/CraftBukkit-Patches/0147-Limit-TNT-Detonations-per-tick.patch b/CraftBukkit-Patches/0146-Limit-TNT-Detonations-per-tick.patch similarity index 97% rename from CraftBukkit-Patches/0147-Limit-TNT-Detonations-per-tick.patch rename to CraftBukkit-Patches/0146-Limit-TNT-Detonations-per-tick.patch index 0fd4fa4..d0dc3cb 100644 --- a/CraftBukkit-Patches/0147-Limit-TNT-Detonations-per-tick.patch +++ b/CraftBukkit-Patches/0146-Limit-TNT-Detonations-per-tick.patch @@ -1,4 +1,4 @@ -From 21d950236aa7a988412f30255ca770c0e0bdb742 Mon Sep 17 00:00:00 2001 +From d966cfec69e14adf9c0cfb56f49bce731977ef8f Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 20 Aug 2014 18:12:32 -0400 Subject: [PATCH] Limit TNT Detonations per tick diff --git a/CraftBukkit-Patches/0148-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch b/CraftBukkit-Patches/0147-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch similarity index 98% rename from CraftBukkit-Patches/0148-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch rename to CraftBukkit-Patches/0147-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch index 7a550e0..f41371d 100644 --- a/CraftBukkit-Patches/0148-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch +++ b/CraftBukkit-Patches/0147-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch @@ -1,4 +1,4 @@ -From d521aa9ddf7e565fbb704310d408470c7c0e74b2 Mon Sep 17 00:00:00 2001 +From 4a59f59f867cb21da9e1a5da6f3e06e70c726e15 Mon Sep 17 00:00:00 2001 From: libraryaddict Date: Fri, 22 Aug 2014 05:35:16 -0400 Subject: [PATCH] Added isUnbreakable and setUnbreakable to ItemMeta diff --git a/CraftBukkit-Patches/0149-Configurable-Hanging-Tick.patch b/CraftBukkit-Patches/0148-Configurable-Hanging-Tick.patch similarity index 95% rename from CraftBukkit-Patches/0149-Configurable-Hanging-Tick.patch rename to CraftBukkit-Patches/0148-Configurable-Hanging-Tick.patch index 1461348..15086e2 100644 --- a/CraftBukkit-Patches/0149-Configurable-Hanging-Tick.patch +++ b/CraftBukkit-Patches/0148-Configurable-Hanging-Tick.patch @@ -1,4 +1,4 @@ -From 280c0f420ece8dd300b54be1e37cde5aae71cf37 Mon Sep 17 00:00:00 2001 +From 8a83720e3e9a6d45d8510de3b4648f4dac56afcd Mon Sep 17 00:00:00 2001 From: drXor Date: Sat, 9 Aug 2014 13:56:51 -0400 Subject: [PATCH] Configurable Hanging Tick diff --git a/CraftBukkit-Patches/0150-Refactor-ItemDoor-Place.patch b/CraftBukkit-Patches/0149-Refactor-ItemDoor-Place.patch similarity index 95% rename from CraftBukkit-Patches/0150-Refactor-ItemDoor-Place.patch rename to CraftBukkit-Patches/0149-Refactor-ItemDoor-Place.patch index d363107..7ded39a 100644 --- a/CraftBukkit-Patches/0150-Refactor-ItemDoor-Place.patch +++ b/CraftBukkit-Patches/0149-Refactor-ItemDoor-Place.patch @@ -1,4 +1,4 @@ -From 9edf518658c3d715c769f4d9c06dd048cb34dd54 Mon Sep 17 00:00:00 2001 +From 90bd24d4d28e095139ef5331db56120c87d507e4 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 30 Sep 2014 21:43:15 +1000 Subject: [PATCH] Refactor ItemDoor Place diff --git a/CraftBukkit-Patches/0151-BungeeCord-Chat-API.patch b/CraftBukkit-Patches/0150-BungeeCord-Chat-API.patch similarity index 96% rename from CraftBukkit-Patches/0151-BungeeCord-Chat-API.patch rename to CraftBukkit-Patches/0150-BungeeCord-Chat-API.patch index 7e3ac07..96d97c5 100644 --- a/CraftBukkit-Patches/0151-BungeeCord-Chat-API.patch +++ b/CraftBukkit-Patches/0150-BungeeCord-Chat-API.patch @@ -1,4 +1,4 @@ -From 3dbfff07a5322402f177060407459795ef407a96 Mon Sep 17 00:00:00 2001 +From 4b43d0abade838e24e8635f55681e4df2a70f59a Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 13 Dec 2014 13:06:05 +1100 Subject: [PATCH] BungeeCord Chat API @@ -56,7 +56,7 @@ index 0000000..6cd5df2 + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 10fc305..15aa1b7 100644 +index 050c188..fd41124 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -121,6 +121,7 @@ import io.netty.buffer.ByteBufOutputStream; @@ -67,7 +67,7 @@ index 10fc305..15aa1b7 100644 public final class CraftServer implements Server { private static final Player[] EMPTY_PLAYER_ARRAY = new Player[0]; -@@ -1705,6 +1706,20 @@ public final class CraftServer implements Server { +@@ -1701,6 +1702,20 @@ public final class CraftServer implements Server { { return org.spigotmc.SpigotConfig.config; } diff --git a/CraftBukkit-Patches/0152-Use-Standard-List-for-EntitySlices.patch b/CraftBukkit-Patches/0151-Use-Standard-List-for-EntitySlices.patch similarity index 98% rename from CraftBukkit-Patches/0152-Use-Standard-List-for-EntitySlices.patch rename to CraftBukkit-Patches/0151-Use-Standard-List-for-EntitySlices.patch index e4d2e57..1515a12 100644 --- a/CraftBukkit-Patches/0152-Use-Standard-List-for-EntitySlices.patch +++ b/CraftBukkit-Patches/0151-Use-Standard-List-for-EntitySlices.patch @@ -1,4 +1,4 @@ -From a55527d1828bade2cc9a2bb5a9a44a8e19e89c64 Mon Sep 17 00:00:00 2001 +From ded6753e6d24ed3df37cd9a82f4172714a2f1536 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 20 Feb 2015 21:33:36 +1100 Subject: [PATCH] Use Standard List for EntitySlices. diff --git a/CraftBukkit-Patches/0153-Allow-Capping-Tile-Entity-Tick-Time.patch b/CraftBukkit-Patches/0152-Allow-Capping-Tile-Entity-Tick-Time.patch similarity index 98% rename from CraftBukkit-Patches/0153-Allow-Capping-Tile-Entity-Tick-Time.patch rename to CraftBukkit-Patches/0152-Allow-Capping-Tile-Entity-Tick-Time.patch index a705237..7c8b4ff 100644 --- a/CraftBukkit-Patches/0153-Allow-Capping-Tile-Entity-Tick-Time.patch +++ b/CraftBukkit-Patches/0152-Allow-Capping-Tile-Entity-Tick-Time.patch @@ -1,4 +1,4 @@ -From 7a8d0e4b3fa6422a8751bdc043d58394913d9252 Mon Sep 17 00:00:00 2001 +From 0ab46e5c885ac8f12eaf058dbcbc85c526ae416d Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 20 Feb 2015 21:39:31 +1100 Subject: [PATCH] Allow Capping (Tile)Entity Tick Time. @@ -10,7 +10,7 @@ For tiles there is very little tradeoff for this option, as tile ticks are based This feature was commisioned by Chunkr. diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 2c947ca..6de5ba5 100644 +index 675d747..ad0ee74 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -137,6 +137,9 @@ public abstract class World implements IBlockAccess { diff --git a/CraftBukkit-Patches/0154-Use-FastMatches-for-ItemStack-Dirty-Check.patch b/CraftBukkit-Patches/0153-Use-FastMatches-for-ItemStack-Dirty-Check.patch similarity index 97% rename from CraftBukkit-Patches/0154-Use-FastMatches-for-ItemStack-Dirty-Check.patch rename to CraftBukkit-Patches/0153-Use-FastMatches-for-ItemStack-Dirty-Check.patch index cd1ae6b..c8bb38c 100644 --- a/CraftBukkit-Patches/0154-Use-FastMatches-for-ItemStack-Dirty-Check.patch +++ b/CraftBukkit-Patches/0153-Use-FastMatches-for-ItemStack-Dirty-Check.patch @@ -1,4 +1,4 @@ -From e851ebeb7b4479287bbaf003c4f2cdb51faa5119 Mon Sep 17 00:00:00 2001 +From 6234597a7e55afd37c3b30c5a31b74440aa88e3c Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 22 Feb 2015 12:27:40 +1100 Subject: [PATCH] Use FastMatches for ItemStack Dirty Check diff --git a/CraftBukkit-Patches/0155-Use-CLQ-for-main-thread-tasks.patch b/CraftBukkit-Patches/0154-Use-CLQ-for-main-thread-tasks.patch similarity index 97% rename from CraftBukkit-Patches/0155-Use-CLQ-for-main-thread-tasks.patch rename to CraftBukkit-Patches/0154-Use-CLQ-for-main-thread-tasks.patch index 578d6e0..fa3eb43 100644 --- a/CraftBukkit-Patches/0155-Use-CLQ-for-main-thread-tasks.patch +++ b/CraftBukkit-Patches/0154-Use-CLQ-for-main-thread-tasks.patch @@ -1,4 +1,4 @@ -From 2dd7fa6e3be9ded06d72c90a0426ef938f7688c3 Mon Sep 17 00:00:00 2001 +From 6e013773c3bd27469674a2fc4b9d57b438e5f523 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 19 Apr 2015 09:19:39 +1000 Subject: [PATCH] Use CLQ for main thread tasks.