diff --git a/Bukkit b/Bukkit index 8d5b4c1e9a..f210234e59 160000 --- a/Bukkit +++ b/Bukkit @@ -1 +1 @@ -Subproject commit 8d5b4c1e9acc499377da0d807e7ca2245d5c3bdf +Subproject commit f210234e59275330f83b994e199c76f6abd41ee7 diff --git a/Bukkit-Patches/0015-Add-Getter-for-Entity-Invulnerability.patch b/Bukkit-Patches/0015-Add-Getter-for-Entity-Invulnerability.patch index c8b6b90427..7b0a70e0b2 100644 --- a/Bukkit-Patches/0015-Add-Getter-for-Entity-Invulnerability.patch +++ b/Bukkit-Patches/0015-Add-Getter-for-Entity-Invulnerability.patch @@ -1,14 +1,14 @@ -From e0d91a1e2cb6199febbebaeefc31c3d65c7de491 Mon Sep 17 00:00:00 2001 +From a0050052a88535b6fa078ada0ee818aeb6906835 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 3 Aug 2013 19:49:36 +1000 Subject: [PATCH] Add Getter for Entity Invulnerability diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 396ea20..294e80b 100644 +index a60172d..5a1e895 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -291,4 +291,22 @@ public interface Entity extends Metadatable { +@@ -295,4 +295,22 @@ public interface Entity extends Metadatable { * @return The current vehicle. */ public Entity getVehicle(); diff --git a/Bukkit-Patches/0028-Fix-slow-tab-complete-for-some-commands.patch b/Bukkit-Patches/0028-Fix-slow-tab-complete-for-some-commands.patch index 17e191e78a..0ce28f64f8 100644 --- a/Bukkit-Patches/0028-Fix-slow-tab-complete-for-some-commands.patch +++ b/Bukkit-Patches/0028-Fix-slow-tab-complete-for-some-commands.patch @@ -1,25 +1,12 @@ -From 1aa49f17b57768c68ddfe4be0a7ec9f86d0facbc Mon Sep 17 00:00:00 2001 +From 2ccaec690f2f7d6d47ed8d4a13206fd748ad7fef Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 22 Jul 2014 21:01:32 +1000 Subject: [PATCH] Fix slow tab complete for some commands. Use online players instead of offline players, which is very slow. -diff --git a/src/main/java/org/bukkit/command/defaults/DeopCommand.java b/src/main/java/org/bukkit/command/defaults/DeopCommand.java -index 1b71d49..8a571e8 100644 ---- a/src/main/java/org/bukkit/command/defaults/DeopCommand.java -+++ b/src/main/java/org/bukkit/command/defaults/DeopCommand.java -@@ -49,7 +49,7 @@ public class DeopCommand extends VanillaCommand { - - if (args.length == 1) { - List completions = new ArrayList(); -- for (OfflinePlayer player : Bukkit.getOfflinePlayers()) { -+ for (OfflinePlayer player : Bukkit.getOnlinePlayers()) { // Spigot - offline players is slow - String playerName = player.getName(); - if (player.isOp() && StringUtil.startsWithIgnoreCase(playerName, args[0])) { - completions.add(playerName); diff --git a/src/main/java/org/bukkit/command/defaults/WhitelistCommand.java b/src/main/java/org/bukkit/command/defaults/WhitelistCommand.java -index b3fa4f8..fd81ee3 100644 +index b3fa4f8..6559b33 100644 --- a/src/main/java/org/bukkit/command/defaults/WhitelistCommand.java +++ b/src/main/java/org/bukkit/command/defaults/WhitelistCommand.java @@ -104,7 +104,7 @@ public class WhitelistCommand extends VanillaCommand { @@ -27,7 +14,7 @@ index b3fa4f8..fd81ee3 100644 if (args[0].equalsIgnoreCase("add")) { List completions = new ArrayList(); - for (OfflinePlayer player : Bukkit.getOfflinePlayers()) { -+ for (OfflinePlayer player : Bukkit.getOnlinePlayers()) { // Spigot - offline players is slow ++ for (OfflinePlayer player : Bukkit.getOnlinePlayers()) { // Spigot - well maybe sometimes you haven't turned the whitelist on just yet. String name = player.getName(); if (StringUtil.startsWithIgnoreCase(name, args[1]) && !player.isWhitelisted()) { completions.add(name); diff --git a/CraftBukkit b/CraftBukkit index 0b2ed13a5d..07d4558b48 160000 --- a/CraftBukkit +++ b/CraftBukkit @@ -1 +1 @@ -Subproject commit 0b2ed13a5d24fd9620f8b03c1bf888e3eccd715e +Subproject commit 07d4558b48d0717cb7f9e07015c76599b9fe9697 diff --git a/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch b/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch index e7fe1e0c5c..74ade727d9 100644 --- a/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch +++ b/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch @@ -1,4 +1,4 @@ -From b4a9a234fe82b8c7d7117ff6ba84daa5bb1c380b Mon Sep 17 00:00:00 2001 +From be8a0e8c5faf4bfda4034f4b9994e496d08cd159 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Jun 2013 15:10:56 +1000 Subject: [PATCH] Skeleton API Implementations @@ -45,10 +45,10 @@ index 4f8d47d..09e7223 100644 + // Spigot end } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index fe0f200..e026c1f 100644 +index b8a9a14..4198dae 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -@@ -399,4 +399,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { +@@ -402,4 +402,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { return getHandle().vehicle.getBukkitEntity(); } @@ -65,10 +65,10 @@ index fe0f200..e026c1f 100644 + // Spigot end } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 9760f8f..6493ce7 100644 +index bbf310b..da0c78e 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1284,4 +1284,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1287,4 +1287,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { } collection.add(new AttributeModifiable(getHandle().getAttributeMap(), (new AttributeRanged("generic.maxHealth", scaledHealth ? healthScale : getMaxHealth(), 0.0D, Float.MAX_VALUE)).a("Max Health").a(true))); } diff --git a/CraftBukkit-Patches/0042-Player-Collision-API.patch b/CraftBukkit-Patches/0042-Player-Collision-API.patch index fe8946f6af..c50069297a 100644 --- a/CraftBukkit-Patches/0042-Player-Collision-API.patch +++ b/CraftBukkit-Patches/0042-Player-Collision-API.patch @@ -1,11 +1,11 @@ -From 7e036a2f853ca31801801c3661d75a74cfee38f3 Mon Sep 17 00:00:00 2001 +From 3b55fa44285c9acb3af6671c6897f8c12bc6ae56 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 3 Aug 2013 19:27:07 +1000 Subject: [PATCH] Player Collision API diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 54c77f8..4bde9c1 100644 +index a4e29b2..aeab36b 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -430,7 +430,7 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen @@ -31,7 +31,7 @@ index 92ad5c7..859e91f 100644 Entity entity = (Entity) list.get(i); diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index adfaddf..f74e175 100644 +index 84673b4..46aa10e 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -63,6 +63,21 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -57,10 +57,10 @@ index adfaddf..f74e175 100644 public EntityPlayer(MinecraftServer minecraftserver, WorldServer worldserver, GameProfile gameprofile, PlayerInteractManager playerinteractmanager) { super(worldserver, gameprofile); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 8b599f2..ab1c5d8 100644 +index d02d728..62d237d 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1289,6 +1289,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1292,6 +1292,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player { // Spigot start private final Player.Spigot spigot = new Player.Spigot() { diff --git a/CraftBukkit-Patches/0044-Add-Getter-for-Entity-Invulnerability.patch b/CraftBukkit-Patches/0044-Add-Getter-for-Entity-Invulnerability.patch index 37edf3b355..ddd9a16364 100644 --- a/CraftBukkit-Patches/0044-Add-Getter-for-Entity-Invulnerability.patch +++ b/CraftBukkit-Patches/0044-Add-Getter-for-Entity-Invulnerability.patch @@ -1,14 +1,14 @@ -From 2f0abcc6f56027b1f74794e0fa359531ec185205 Mon Sep 17 00:00:00 2001 +From fc034066577293dc3625eea4017b0cd0c667c247 Mon Sep 17 00:00:00 2001 From: DerFlash Date: Sat, 3 Aug 2013 19:53:48 +1000 Subject: [PATCH] Add Getter for Entity Invulnerability diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index e026c1f..96d763b 100644 +index 4198dae..ce18aea 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -@@ -403,6 +403,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { +@@ -406,6 +406,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { // Spigot start private final Spigot spigot = new Spigot() { diff --git a/CraftBukkit-Patches/0045-Cap-Minimum-Player-Speed.patch b/CraftBukkit-Patches/0045-Cap-Minimum-Player-Speed.patch index 673028b0af..434f8af917 100644 --- a/CraftBukkit-Patches/0045-Cap-Minimum-Player-Speed.patch +++ b/CraftBukkit-Patches/0045-Cap-Minimum-Player-Speed.patch @@ -1,14 +1,14 @@ -From cc4c7dc555c07985d566dc1c85baadc309c8610e Mon Sep 17 00:00:00 2001 +From a52057bc770732b2466e87998df89545a9f22230 Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 5 Aug 2013 20:17:20 +1000 Subject: [PATCH] Cap Minimum Player Speed diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index ab1c5d8..6241ada 100644 +index 62d237d..6ac6520 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1162,7 +1162,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1165,7 +1165,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { public void setFlySpeed(float value) { validateSpeed(value); EntityPlayer player = getHandle(); @@ -17,7 +17,7 @@ index ab1c5d8..6241ada 100644 player.updateAbilities(); } -@@ -1170,7 +1170,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1173,7 +1173,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { public void setWalkSpeed(float value) { validateSpeed(value); EntityPlayer player = getHandle(); diff --git a/CraftBukkit-Patches/0051-Implement-respawn-API.patch b/CraftBukkit-Patches/0051-Implement-respawn-API.patch index f1b0ee373d..89a40317e4 100644 --- a/CraftBukkit-Patches/0051-Implement-respawn-API.patch +++ b/CraftBukkit-Patches/0051-Implement-respawn-API.patch @@ -1,14 +1,14 @@ -From 7b9fb7f421b4298f153613e4f0f083b79b130e25 Mon Sep 17 00:00:00 2001 +From cf5885b4e85cef41dd80102a7b1c04301a88a47c Mon Sep 17 00:00:00 2001 From: ninja- Date: Tue, 8 Oct 2013 14:34:49 +0200 Subject: [PATCH] Implement respawn API. diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 6241ada..232df48 100644 +index 6ac6520..1a9c381 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1302,6 +1302,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1305,6 +1305,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { getHandle().collidesWithEntities = collides; getHandle().k = collides; // First boolean of Entity } diff --git a/CraftBukkit-Patches/0059-Allow-Teleportation-of-Vehicles-and-Passengers.patch b/CraftBukkit-Patches/0059-Allow-Teleportation-of-Vehicles-and-Passengers.patch deleted file mode 100644 index 9a645be9ef..0000000000 --- a/CraftBukkit-Patches/0059-Allow-Teleportation-of-Vehicles-and-Passengers.patch +++ /dev/null @@ -1,40 +0,0 @@ -From a13d03bb5a250afe690b384d547dc1c2ad9b9ae8 Mon Sep 17 00:00:00 2001 -From: ItsHarry -Date: Thu, 5 Dec 2013 21:58:11 +0100 -Subject: [PATCH] Allow Teleportation of Vehicles and Passengers - - -diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 232df48..a77b2d9 100644 ---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -459,9 +459,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player { - return false; - } - -- if (entity.vehicle != null || entity.passenger != null) { -- return false; -- } -+ // Spigot Start -+ // if (entity.vehicle != null || entity.passenger != null) { -+ // return false; -+ // } -+ // Spigot End - - // From = Players current Location - Location from = this.getLocation(); -@@ -475,6 +477,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player { - if (event.isCancelled()) { - return false; - } -+ -+ // Spigot Start -+ eject(); -+ leaveVehicle(); -+ // Spigot End - - // Update the From Location - from = event.getFrom(); --- -1.9.1 - diff --git a/CraftBukkit-Patches/0060-Remove-OS-X-Special-Chars-from-Signs.patch b/CraftBukkit-Patches/0059-Remove-OS-X-Special-Chars-from-Signs.patch similarity index 89% rename from CraftBukkit-Patches/0060-Remove-OS-X-Special-Chars-from-Signs.patch rename to CraftBukkit-Patches/0059-Remove-OS-X-Special-Chars-from-Signs.patch index 49800c3b07..c00cde02e6 100644 --- a/CraftBukkit-Patches/0060-Remove-OS-X-Special-Chars-from-Signs.patch +++ b/CraftBukkit-Patches/0059-Remove-OS-X-Special-Chars-from-Signs.patch @@ -1,11 +1,11 @@ -From 781e95ae6af11cc45899e75e764ec85a8705178c Mon Sep 17 00:00:00 2001 +From e31b577f7de0698aed56af04f4f2aff64d5c7e6a Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 8 Dec 2013 16:52:42 +1100 Subject: [PATCH] Remove OS X Special Chars from Signs diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index f170ad0..1ee5541 100644 +index 234817a..c833842 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1584,6 +1584,7 @@ public class PlayerConnection implements PacketPlayInListener { diff --git a/CraftBukkit-Patches/0061-Orebfuscator.patch b/CraftBukkit-Patches/0060-Orebfuscator.patch similarity index 99% rename from CraftBukkit-Patches/0061-Orebfuscator.patch rename to CraftBukkit-Patches/0060-Orebfuscator.patch index 0d36c95759..7b5a33f080 100644 --- a/CraftBukkit-Patches/0061-Orebfuscator.patch +++ b/CraftBukkit-Patches/0060-Orebfuscator.patch @@ -1,4 +1,4 @@ -From 935843a587ceb77ad93fe57a272c39f2d2dc029b Mon Sep 17 00:00:00 2001 +From 2e82b1fef397aabe97590cdff49286c377b8c3f1 Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 16 May 2013 18:51:05 +1000 Subject: [PATCH] Orebfuscator diff --git a/CraftBukkit-Patches/0062-Optimize-DataWatcher.patch b/CraftBukkit-Patches/0061-Optimize-DataWatcher.patch similarity index 98% rename from CraftBukkit-Patches/0062-Optimize-DataWatcher.patch rename to CraftBukkit-Patches/0061-Optimize-DataWatcher.patch index 0ce43503fe..53d5595929 100644 --- a/CraftBukkit-Patches/0062-Optimize-DataWatcher.patch +++ b/CraftBukkit-Patches/0061-Optimize-DataWatcher.patch @@ -1,4 +1,4 @@ -From 31ab17dc3535db331530e100849a91feba9608b9 Mon Sep 17 00:00:00 2001 +From fbb4966bee9ea69a36b3c5c33fc938022d126ee6 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 13 Dec 2013 11:45:47 +1100 Subject: [PATCH] Optimize DataWatcher diff --git a/CraftBukkit-Patches/0063-Fire-PreLogin-Events-in-Offline-Mode.patch b/CraftBukkit-Patches/0062-Fire-PreLogin-Events-in-Offline-Mode.patch similarity index 99% rename from CraftBukkit-Patches/0063-Fire-PreLogin-Events-in-Offline-Mode.patch rename to CraftBukkit-Patches/0062-Fire-PreLogin-Events-in-Offline-Mode.patch index 0daa89e561..9b4bd890d3 100644 --- a/CraftBukkit-Patches/0063-Fire-PreLogin-Events-in-Offline-Mode.patch +++ b/CraftBukkit-Patches/0062-Fire-PreLogin-Events-in-Offline-Mode.patch @@ -1,4 +1,4 @@ -From f48253e81390ceb92c9fa7adeeea091e3bc66a02 Mon Sep 17 00:00:00 2001 +From 8abafb671cbc9be3cbb51d2c14166edc869f4849 Mon Sep 17 00:00:00 2001 From: md_5 Date: Wed, 18 Dec 2013 13:32:10 +1100 Subject: [PATCH] Fire PreLogin Events in Offline Mode diff --git a/CraftBukkit-Patches/0064-BungeeCord-Support.patch b/CraftBukkit-Patches/0063-BungeeCord-Support.patch similarity index 98% rename from CraftBukkit-Patches/0064-BungeeCord-Support.patch rename to CraftBukkit-Patches/0063-BungeeCord-Support.patch index c02c25cff7..b9dd3b7bc5 100644 --- a/CraftBukkit-Patches/0064-BungeeCord-Support.patch +++ b/CraftBukkit-Patches/0063-BungeeCord-Support.patch @@ -1,4 +1,4 @@ -From f778234f103f8b7c09941172f010f9c43a02c9ae Mon Sep 17 00:00:00 2001 +From 2e8ac3c3738d56396a9731bd6fba7cc258a515d5 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 1 Dec 2013 18:18:41 +1100 Subject: [PATCH] BungeeCord Support @@ -175,10 +175,10 @@ index f8e2f0f..5a08283 100644 @Override diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index a77b2d9..e030666 100644 +index 1a9c381..3eafd75 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1298,6 +1298,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1294,6 +1294,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player { { @Override diff --git a/CraftBukkit-Patches/0065-Allow-Disabling-Zombie-Villager-Aggression.patch b/CraftBukkit-Patches/0064-Allow-Disabling-Zombie-Villager-Aggression.patch similarity index 97% rename from CraftBukkit-Patches/0065-Allow-Disabling-Zombie-Villager-Aggression.patch rename to CraftBukkit-Patches/0064-Allow-Disabling-Zombie-Villager-Aggression.patch index 1da55cb2fe..ce5659dc39 100644 --- a/CraftBukkit-Patches/0065-Allow-Disabling-Zombie-Villager-Aggression.patch +++ b/CraftBukkit-Patches/0064-Allow-Disabling-Zombie-Villager-Aggression.patch @@ -1,4 +1,4 @@ -From 09453b1bf6ee187b875d5e9970821b06374eb84d Mon Sep 17 00:00:00 2001 +From 0a97621b48c190c94dbd507785f483ac5346b3b9 Mon Sep 17 00:00:00 2001 From: Dylan Xaldin Date: Thu, 12 Dec 2013 18:05:03 -0600 Subject: [PATCH] Allow Disabling Zombie Villager Aggression diff --git a/CraftBukkit-Patches/0066-Configurable-Amount-of-Netty-Threads.patch b/CraftBukkit-Patches/0065-Configurable-Amount-of-Netty-Threads.patch similarity index 96% rename from CraftBukkit-Patches/0066-Configurable-Amount-of-Netty-Threads.patch rename to CraftBukkit-Patches/0065-Configurable-Amount-of-Netty-Threads.patch index 88535335fa..4aa1f3cc31 100644 --- a/CraftBukkit-Patches/0066-Configurable-Amount-of-Netty-Threads.patch +++ b/CraftBukkit-Patches/0065-Configurable-Amount-of-Netty-Threads.patch @@ -1,4 +1,4 @@ -From 6648f843706a4d60068bc8b689af566b401ef0ee Mon Sep 17 00:00:00 2001 +From b932d6b340a6a6a929e69f9b9cd6b5a0fc12d099 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 13 Dec 2013 11:58:58 +1100 Subject: [PATCH] Configurable Amount of Netty Threads @@ -6,7 +6,7 @@ Subject: [PATCH] Configurable Amount of Netty Threads This brings back the option that the Spigot version of netty saw. By default Netty will try and use cores*2 threads, however if running multiple servers on the same machine, this can be too many threads. Additionally some people have 16 core servers. If 32 Netty threads are allowed in this setup, then the lock contention, and thus blocking between threads becomes much greater, leading to decreased performance. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 256d2f9..b0157b2 100644 +index d596924..38d7890 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -54,7 +54,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo diff --git a/CraftBukkit-Patches/0067-Prevent-Mineshaft-Saving.patch b/CraftBukkit-Patches/0066-Prevent-Mineshaft-Saving.patch similarity index 93% rename from CraftBukkit-Patches/0067-Prevent-Mineshaft-Saving.patch rename to CraftBukkit-Patches/0066-Prevent-Mineshaft-Saving.patch index c384e8bfdb..dd07dd6902 100644 --- a/CraftBukkit-Patches/0067-Prevent-Mineshaft-Saving.patch +++ b/CraftBukkit-Patches/0066-Prevent-Mineshaft-Saving.patch @@ -1,4 +1,4 @@ -From 89b7b6b5de036aeb7140204ef95288767c9b1a20 Mon Sep 17 00:00:00 2001 +From 24da9b64d2d522cff1e8dc331a9d31153837c7d7 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 13 Dec 2013 15:21:02 +1100 Subject: [PATCH] Prevent Mineshaft Saving diff --git a/CraftBukkit-Patches/0068-Log-Cause-of-Unexpected-Exceptions.patch b/CraftBukkit-Patches/0067-Log-Cause-of-Unexpected-Exceptions.patch similarity index 90% rename from CraftBukkit-Patches/0068-Log-Cause-of-Unexpected-Exceptions.patch rename to CraftBukkit-Patches/0067-Log-Cause-of-Unexpected-Exceptions.patch index 0c54142c37..1434c32016 100644 --- a/CraftBukkit-Patches/0068-Log-Cause-of-Unexpected-Exceptions.patch +++ b/CraftBukkit-Patches/0067-Log-Cause-of-Unexpected-Exceptions.patch @@ -1,11 +1,11 @@ -From 55448475919982a16da1ab626234f920ec1687cc Mon Sep 17 00:00:00 2001 +From c36c747624ea7d3089686e8f7a48ce1b862941d1 Mon Sep 17 00:00:00 2001 From: md_5 Date: Wed, 18 Dec 2013 13:39:14 +1100 Subject: [PATCH] Log Cause of Unexpected Exceptions diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index b0157b2..ee74b03 100644 +index 38d7890..6a31aaa 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -479,6 +479,12 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo diff --git a/CraftBukkit-Patches/0069-Particle-API.patch b/CraftBukkit-Patches/0068-Particle-API.patch similarity index 98% rename from CraftBukkit-Patches/0069-Particle-API.patch rename to CraftBukkit-Patches/0068-Particle-API.patch index fe0ee2f269..d8bf8f0d7e 100644 --- a/CraftBukkit-Patches/0069-Particle-API.patch +++ b/CraftBukkit-Patches/0068-Particle-API.patch @@ -1,4 +1,4 @@ -From b3d80db144b04c9cfefed4610975d85afd7a4193 Mon Sep 17 00:00:00 2001 +From 6961a86266ba0a25e5331b9e1f9bcc4bdef39f46 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Fri, 20 Dec 2013 21:36:06 +0000 Subject: [PATCH] Particle API @@ -117,10 +117,10 @@ index 28aa997..53a5d37 100644 public Spigot spigot() diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index e030666..c8787cf 100644 +index 3eafd75..6960a29 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1324,6 +1324,49 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1320,6 +1320,49 @@ public class CraftPlayer extends CraftHumanEntity implements Player { server.getServer().getPlayerList().moveToWorld( getHandle(), 0, false ); } } diff --git a/CraftBukkit-Patches/0070-Fix-Biome-Decoration-Crashes.patch b/CraftBukkit-Patches/0069-Fix-Biome-Decoration-Crashes.patch similarity index 98% rename from CraftBukkit-Patches/0070-Fix-Biome-Decoration-Crashes.patch rename to CraftBukkit-Patches/0069-Fix-Biome-Decoration-Crashes.patch index 6fe5c34a10..5140fddc77 100644 --- a/CraftBukkit-Patches/0070-Fix-Biome-Decoration-Crashes.patch +++ b/CraftBukkit-Patches/0069-Fix-Biome-Decoration-Crashes.patch @@ -1,4 +1,4 @@ -From 6e2992826ace9cace8cab51a9fa10f4aeeef02ee Mon Sep 17 00:00:00 2001 +From 99e4136c831158d35954f6dfd3c7df956d3166b8 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 5 Jan 2014 09:35:01 +1100 Subject: [PATCH] Fix Biome Decoration Crashes diff --git a/CraftBukkit-Patches/0071-Save-ticks-lived-to-nbttag.patch b/CraftBukkit-Patches/0070-Save-ticks-lived-to-nbttag.patch similarity index 95% rename from CraftBukkit-Patches/0071-Save-ticks-lived-to-nbttag.patch rename to CraftBukkit-Patches/0070-Save-ticks-lived-to-nbttag.patch index a77be11a2d..bbb8f6b0ad 100644 --- a/CraftBukkit-Patches/0071-Save-ticks-lived-to-nbttag.patch +++ b/CraftBukkit-Patches/0070-Save-ticks-lived-to-nbttag.patch @@ -1,4 +1,4 @@ -From 8b0702543bb04a6d8f40e0cbdb5918a9dfea87ee Mon Sep 17 00:00:00 2001 +From 35929fa4ccb9b137ea9ba71960556e8b350da3a1 Mon Sep 17 00:00:00 2001 From: DerFlash Date: Tue, 9 Jul 2013 00:11:12 +0200 Subject: [PATCH] Save ticks lived to nbttag diff --git a/CraftBukkit-Patches/0072-More-Efficient-GetCubes.patch b/CraftBukkit-Patches/0071-More-Efficient-GetCubes.patch similarity index 97% rename from CraftBukkit-Patches/0072-More-Efficient-GetCubes.patch rename to CraftBukkit-Patches/0071-More-Efficient-GetCubes.patch index 5fe086fdd1..c704fbb5b2 100644 --- a/CraftBukkit-Patches/0072-More-Efficient-GetCubes.patch +++ b/CraftBukkit-Patches/0071-More-Efficient-GetCubes.patch @@ -1,4 +1,4 @@ -From 7ff3821ee8e67caeca8a28ed04679ceb79010b33 Mon Sep 17 00:00:00 2001 +From f5aff1c6150386b0f6ed9d72fbd2ef545a4b1182 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 11 Jun 2013 12:17:37 +1000 Subject: [PATCH] More Efficient GetCubes diff --git a/CraftBukkit-Patches/0073-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch b/CraftBukkit-Patches/0072-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch similarity index 98% rename from CraftBukkit-Patches/0073-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch rename to CraftBukkit-Patches/0072-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch index ea5494fa31..04ce49a7d1 100644 --- a/CraftBukkit-Patches/0073-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch +++ b/CraftBukkit-Patches/0072-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch @@ -1,4 +1,4 @@ -From 2a00eb8a54efd19242c35ab1b0e4eefed740cb5f Mon Sep 17 00:00:00 2001 +From f15a5c56868c9a2cc8e7e8b9d242545a93b4ef5e Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Feb 2014 16:55:46 +0000 Subject: [PATCH] Add Option to Nerf Mobs from Spawner's diff --git a/CraftBukkit-Patches/0074-Warn-if-PermGen-may-be-insufficient.patch b/CraftBukkit-Patches/0073-Warn-if-PermGen-may-be-insufficient.patch similarity index 96% rename from CraftBukkit-Patches/0074-Warn-if-PermGen-may-be-insufficient.patch rename to CraftBukkit-Patches/0073-Warn-if-PermGen-may-be-insufficient.patch index d554a8b026..db58908b78 100644 --- a/CraftBukkit-Patches/0074-Warn-if-PermGen-may-be-insufficient.patch +++ b/CraftBukkit-Patches/0073-Warn-if-PermGen-may-be-insufficient.patch @@ -1,4 +1,4 @@ -From 769391e3693495e22429582900873ec508d00dbe Mon Sep 17 00:00:00 2001 +From adfff3c12ad93f7f3b48f7baf9d648627223e170 Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 23 Dec 2013 14:07:41 +1100 Subject: [PATCH] Warn if PermGen may be insufficient diff --git a/CraftBukkit-Patches/0075-Disable-Connected-Check-on-setScoreboard.patch b/CraftBukkit-Patches/0074-Disable-Connected-Check-on-setScoreboard.patch similarity index 85% rename from CraftBukkit-Patches/0075-Disable-Connected-Check-on-setScoreboard.patch rename to CraftBukkit-Patches/0074-Disable-Connected-Check-on-setScoreboard.patch index ecda768500..6ad11ae96b 100644 --- a/CraftBukkit-Patches/0075-Disable-Connected-Check-on-setScoreboard.patch +++ b/CraftBukkit-Patches/0074-Disable-Connected-Check-on-setScoreboard.patch @@ -1,14 +1,14 @@ -From 169fe9965d4bd6da2336398d0a353e3f6d05f8cd Mon Sep 17 00:00:00 2001 +From 3c7258e5cfca3d6d3fe63c3debdc8afbc767925e Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 23 Dec 2013 15:57:57 +1100 Subject: [PATCH] Disable Connected Check on setScoreboard diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index c8787cf..c96c432 100644 +index 6960a29..5a39069 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1225,7 +1225,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1221,7 +1221,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { throw new IllegalStateException("Cannot set scoreboard yet"); } if (playerConnection.isDisconnected()) { diff --git a/CraftBukkit-Patches/0076-Add-Late-Bind-Option.patch b/CraftBukkit-Patches/0075-Add-Late-Bind-Option.patch similarity index 97% rename from CraftBukkit-Patches/0076-Add-Late-Bind-Option.patch rename to CraftBukkit-Patches/0075-Add-Late-Bind-Option.patch index d476c320cb..19d54107d8 100644 --- a/CraftBukkit-Patches/0076-Add-Late-Bind-Option.patch +++ b/CraftBukkit-Patches/0075-Add-Late-Bind-Option.patch @@ -1,4 +1,4 @@ -From 7f5e5194bd11e6669f6b9c2e3ce1b38e85411956 Mon Sep 17 00:00:00 2001 +From 42dcfeeb17332d00efa384937a60f3a063737c43 Mon Sep 17 00:00:00 2001 From: slide23 Date: Fri, 20 Dec 2013 20:15:33 -0600 Subject: [PATCH] Add Late Bind Option diff --git a/CraftBukkit-Patches/0077-Allow-statistics-to-be-disabled-forced.patch b/CraftBukkit-Patches/0076-Allow-statistics-to-be-disabled-forced.patch similarity index 98% rename from CraftBukkit-Patches/0077-Allow-statistics-to-be-disabled-forced.patch rename to CraftBukkit-Patches/0076-Allow-statistics-to-be-disabled-forced.patch index 5d64212a0e..b4aed7821d 100644 --- a/CraftBukkit-Patches/0077-Allow-statistics-to-be-disabled-forced.patch +++ b/CraftBukkit-Patches/0076-Allow-statistics-to-be-disabled-forced.patch @@ -1,4 +1,4 @@ -From a5b5ae6423008efad34229f0d333432365d22eec Mon Sep 17 00:00:00 2001 +From 3df787b4f38038fbf74c5fdc2f3e09d048e86388 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Tue, 7 Jan 2014 15:56:26 +0000 Subject: [PATCH] Allow statistics to be disabled/forced diff --git a/CraftBukkit-Patches/0078-Fix-anvil-collisions.patch b/CraftBukkit-Patches/0077-Fix-anvil-collisions.patch similarity index 92% rename from CraftBukkit-Patches/0078-Fix-anvil-collisions.patch rename to CraftBukkit-Patches/0077-Fix-anvil-collisions.patch index 8e82c03f25..114d91bb00 100644 --- a/CraftBukkit-Patches/0078-Fix-anvil-collisions.patch +++ b/CraftBukkit-Patches/0077-Fix-anvil-collisions.patch @@ -1,4 +1,4 @@ -From e963131042579be23e566b7b326e1516955b2fe8 Mon Sep 17 00:00:00 2001 +From 966a4196a0d442611e8aa75cd80eda3713c66008 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Thu, 9 Jan 2014 14:19:12 +0000 Subject: [PATCH] Fix anvil collisions diff --git a/CraftBukkit-Patches/0079-Fix-ItemStack-Unbreakable-Code.patch b/CraftBukkit-Patches/0078-Fix-ItemStack-Unbreakable-Code.patch similarity index 89% rename from CraftBukkit-Patches/0079-Fix-ItemStack-Unbreakable-Code.patch rename to CraftBukkit-Patches/0078-Fix-ItemStack-Unbreakable-Code.patch index 14ecce3bb5..0768669a5a 100644 --- a/CraftBukkit-Patches/0079-Fix-ItemStack-Unbreakable-Code.patch +++ b/CraftBukkit-Patches/0078-Fix-ItemStack-Unbreakable-Code.patch @@ -1,11 +1,11 @@ -From 5f95f690767115879007e1971575bfe91d3b710e Mon Sep 17 00:00:00 2001 +From 5dcfb85231b0820ef51a3fd1b9f4bdf2867f903f Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 10 Jan 2014 15:15:50 +1100 Subject: [PATCH] Fix ItemStack Unbreakable Code diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java -index 05d7c4e..2723ccb 100644 +index a2ab06a..7d2d401 100644 --- a/src/main/java/net/minecraft/server/ItemStack.java +++ b/src/main/java/net/minecraft/server/ItemStack.java @@ -228,7 +228,13 @@ public final class ItemStack { diff --git a/CraftBukkit-Patches/0080-Try-and-Debug-Crash-Reports-Crashing.patch b/CraftBukkit-Patches/0079-Try-and-Debug-Crash-Reports-Crashing.patch similarity index 96% rename from CraftBukkit-Patches/0080-Try-and-Debug-Crash-Reports-Crashing.patch rename to CraftBukkit-Patches/0079-Try-and-Debug-Crash-Reports-Crashing.patch index 6896a39bcb..2e66f9f51e 100644 --- a/CraftBukkit-Patches/0080-Try-and-Debug-Crash-Reports-Crashing.patch +++ b/CraftBukkit-Patches/0079-Try-and-Debug-Crash-Reports-Crashing.patch @@ -1,4 +1,4 @@ -From c1f169eb0d0b24c2d56c853920cb54b09e0cf789 Mon Sep 17 00:00:00 2001 +From 326870b58da26934e61f4598c1650d89105e0b41 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 12 Jan 2014 20:56:41 +1100 Subject: [PATCH] Try and Debug Crash Reports Crashing diff --git a/CraftBukkit-Patches/0081-Replace-AutoSave-Mechanism.patch b/CraftBukkit-Patches/0080-Replace-AutoSave-Mechanism.patch similarity index 94% rename from CraftBukkit-Patches/0081-Replace-AutoSave-Mechanism.patch rename to CraftBukkit-Patches/0080-Replace-AutoSave-Mechanism.patch index 581c91ec4e..ded114b5b1 100644 --- a/CraftBukkit-Patches/0081-Replace-AutoSave-Mechanism.patch +++ b/CraftBukkit-Patches/0080-Replace-AutoSave-Mechanism.patch @@ -1,4 +1,4 @@ -From f47619fa36a666e37d58e2178f1acb04550a4afd Mon Sep 17 00:00:00 2001 +From 3cab58a89c92eab6316f285fa419ce09c49bc2b0 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 12 Jan 2014 21:07:18 +1100 Subject: [PATCH] Replace AutoSave Mechanism @@ -6,7 +6,7 @@ Subject: [PATCH] Replace AutoSave Mechanism The problem here is that MinecraftServer.save(..), will attempt to sleep whilst all pending chunks are written to disk, however due to various and complicated bugs, it will wait for an incorrect amount of chunks, which may cause it to sleep for an overly long amount of time. Instead we will mimic the save-all command in its behaviour, which is both safe and performant. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index edd781e..622e522 100644 +index 28471d6..8ff8d9f 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -583,7 +583,16 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo diff --git a/CraftBukkit-Patches/0082-Block-data-values-that-crash-the-client.patch b/CraftBukkit-Patches/0081-Block-data-values-that-crash-the-client.patch similarity index 95% rename from CraftBukkit-Patches/0082-Block-data-values-that-crash-the-client.patch rename to CraftBukkit-Patches/0081-Block-data-values-that-crash-the-client.patch index 08285c7ce0..306e81c021 100644 --- a/CraftBukkit-Patches/0082-Block-data-values-that-crash-the-client.patch +++ b/CraftBukkit-Patches/0081-Block-data-values-that-crash-the-client.patch @@ -1,11 +1,11 @@ -From 05ae31b837b5ba85a42d524cf57ae8898a68bed1 Mon Sep 17 00:00:00 2001 +From 871021795c88fb39e7677f38af2281a321d852e1 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Wed, 15 Jan 2014 21:52:47 +0000 Subject: [PATCH] Block data values that crash the client diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 04c0d64..5641ad7 100644 +index b1213f0..cbcc9e9 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -143,7 +143,7 @@ public class Chunk { diff --git a/CraftBukkit-Patches/0083-Support-vanilla-s-direction-tag-on-fireballs.patch b/CraftBukkit-Patches/0082-Support-vanilla-s-direction-tag-on-fireballs.patch similarity index 96% rename from CraftBukkit-Patches/0083-Support-vanilla-s-direction-tag-on-fireballs.patch rename to CraftBukkit-Patches/0082-Support-vanilla-s-direction-tag-on-fireballs.patch index 1c09edad24..7ce98ed411 100644 --- a/CraftBukkit-Patches/0083-Support-vanilla-s-direction-tag-on-fireballs.patch +++ b/CraftBukkit-Patches/0082-Support-vanilla-s-direction-tag-on-fireballs.patch @@ -1,4 +1,4 @@ -From c0d47c921873aefbcd521a49e1ca4b2fe4e229c0 Mon Sep 17 00:00:00 2001 +From 2b1c58da2148476cb86ccd2d5735ced60c994a58 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Sat, 18 Jan 2014 14:27:03 +0000 Subject: [PATCH] Support vanilla's direction tag on fireballs diff --git a/CraftBukkit-Patches/0084-Support-non-prefixed-URLs.patch b/CraftBukkit-Patches/0083-Support-non-prefixed-URLs.patch similarity index 97% rename from CraftBukkit-Patches/0084-Support-non-prefixed-URLs.patch rename to CraftBukkit-Patches/0083-Support-non-prefixed-URLs.patch index 90da1199a8..71648349de 100644 --- a/CraftBukkit-Patches/0084-Support-non-prefixed-URLs.patch +++ b/CraftBukkit-Patches/0083-Support-non-prefixed-URLs.patch @@ -1,4 +1,4 @@ -From 74c918db5acf2e55d50ec74a002c94b5a324eda8 Mon Sep 17 00:00:00 2001 +From af9162fb9071d162935ba10077e4cc3f823361b4 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Sat, 18 Jan 2014 19:32:42 +0000 Subject: [PATCH] Support non-prefixed URLs diff --git a/CraftBukkit-Patches/0085-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch b/CraftBukkit-Patches/0084-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch similarity index 95% rename from CraftBukkit-Patches/0085-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch rename to CraftBukkit-Patches/0084-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch index 17e02e91e5..8b518966f1 100644 --- a/CraftBukkit-Patches/0085-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch +++ b/CraftBukkit-Patches/0084-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch @@ -1,4 +1,4 @@ -From 283681575a9a1a54671903e53cd098128e64bc08 Mon Sep 17 00:00:00 2001 +From 598322bca53525489f591d5c059af60b47d4e65b Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 20 Jan 2014 13:44:07 +1100 Subject: [PATCH] Catch stalling on corrupted map data / NBT arrays. diff --git a/CraftBukkit-Patches/0086-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch b/CraftBukkit-Patches/0085-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch similarity index 96% rename from CraftBukkit-Patches/0086-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch rename to CraftBukkit-Patches/0085-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch index 78dfaed943..b55b5aac48 100644 --- a/CraftBukkit-Patches/0086-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch +++ b/CraftBukkit-Patches/0085-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch @@ -1,4 +1,4 @@ -From f31c96292e6dcf2c7eb36c540e31530be32eddeb Mon Sep 17 00:00:00 2001 +From b1b17791ca84eb2b8450716e591731fc34ee44e2 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/0087-Highly-Optimized-Tick-Loop.patch b/CraftBukkit-Patches/0086-Highly-Optimized-Tick-Loop.patch similarity index 98% rename from CraftBukkit-Patches/0087-Highly-Optimized-Tick-Loop.patch rename to CraftBukkit-Patches/0086-Highly-Optimized-Tick-Loop.patch index f1c235d76a..8d2701e1cb 100644 --- a/CraftBukkit-Patches/0087-Highly-Optimized-Tick-Loop.patch +++ b/CraftBukkit-Patches/0086-Highly-Optimized-Tick-Loop.patch @@ -1,11 +1,11 @@ -From 660928dd4dcdd2929af3c2ea7a5f3244d3d90c0e Mon Sep 17 00:00:00 2001 +From 69feb252a24d7e1a6413d1b62c87125ed107d22c 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/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 622e522..d6cd151 100644 +index 8ff8d9f..4c9c3a8 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -107,6 +107,12 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo diff --git a/CraftBukkit-Patches/0088-Add-Spigot-Links.patch b/CraftBukkit-Patches/0087-Add-Spigot-Links.patch similarity index 98% rename from CraftBukkit-Patches/0088-Add-Spigot-Links.patch rename to CraftBukkit-Patches/0087-Add-Spigot-Links.patch index c452fd691d..d0718f82f9 100644 --- a/CraftBukkit-Patches/0088-Add-Spigot-Links.patch +++ b/CraftBukkit-Patches/0087-Add-Spigot-Links.patch @@ -1,4 +1,4 @@ -From c503e721883271f733720ccec29a36b1d48535fb Mon Sep 17 00:00:00 2001 +From 3c992adcd28936bd042215fa6180135728e95f0d 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/0089-Configurable-Ping-Sample-Size.patch b/CraftBukkit-Patches/0088-Configurable-Ping-Sample-Size.patch similarity index 96% rename from CraftBukkit-Patches/0089-Configurable-Ping-Sample-Size.patch rename to CraftBukkit-Patches/0088-Configurable-Ping-Sample-Size.patch index 61beb0c934..52bc234478 100644 --- a/CraftBukkit-Patches/0089-Configurable-Ping-Sample-Size.patch +++ b/CraftBukkit-Patches/0088-Configurable-Ping-Sample-Size.patch @@ -1,4 +1,4 @@ -From f9ee498632c0c8ebea52cee04a050647ee850f4b Mon Sep 17 00:00:00 2001 +From 9d2e381350961f68acd219f86e257237934dc645 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/0090-Add-Optional-Tick-Shuffling.patch b/CraftBukkit-Patches/0089-Add-Optional-Tick-Shuffling.patch similarity index 96% rename from CraftBukkit-Patches/0090-Add-Optional-Tick-Shuffling.patch rename to CraftBukkit-Patches/0089-Add-Optional-Tick-Shuffling.patch index ff088ef521..1bb24487b6 100644 --- a/CraftBukkit-Patches/0090-Add-Optional-Tick-Shuffling.patch +++ b/CraftBukkit-Patches/0089-Add-Optional-Tick-Shuffling.patch @@ -1,4 +1,4 @@ -From 578d974237e631aa8d5da33bf196892ec67aecdd Mon Sep 17 00:00:00 2001 +From 858714e486e105bf61645731323132cf6059dfa0 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/0091-Allow-Configuring-Chunks-per-Packet.patch b/CraftBukkit-Patches/0090-Allow-Configuring-Chunks-per-Packet.patch similarity index 94% rename from CraftBukkit-Patches/0091-Allow-Configuring-Chunks-per-Packet.patch rename to CraftBukkit-Patches/0090-Allow-Configuring-Chunks-per-Packet.patch index fb95a34948..8672c9118c 100644 --- a/CraftBukkit-Patches/0091-Allow-Configuring-Chunks-per-Packet.patch +++ b/CraftBukkit-Patches/0090-Allow-Configuring-Chunks-per-Packet.patch @@ -1,11 +1,11 @@ -From d48d4d4439f96703651ab58bbc298f50f6d443c6 Mon Sep 17 00:00:00 2001 +From dad777bc8491fbbac59ab6929003ce7be400a639 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 f74e175..8ffa3bc 100644 +index 46aa10e..7eb66ea 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -214,7 +214,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/CraftBukkit-Patches/0092-Implement-Locale-Getter-for-Players.patch b/CraftBukkit-Patches/0091-Implement-Locale-Getter-for-Players.patch similarity index 88% rename from CraftBukkit-Patches/0092-Implement-Locale-Getter-for-Players.patch rename to CraftBukkit-Patches/0091-Implement-Locale-Getter-for-Players.patch index 3c86cee0a6..d688cd763d 100644 --- a/CraftBukkit-Patches/0092-Implement-Locale-Getter-for-Players.patch +++ b/CraftBukkit-Patches/0091-Implement-Locale-Getter-for-Players.patch @@ -1,11 +1,11 @@ -From d94a53ba309c95b6c449908e78b5de529c71ab5d Mon Sep 17 00:00:00 2001 +From 991a52b5b0491761079cc39b3d02638bfb975018 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 8ffa3bc..8aa530f 100644 +index 7eb66ea..a48a1c0 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -30,7 +30,7 @@ import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; @@ -18,10 +18,10 @@ index 8ffa3bc..8aa530f 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 c96c432..b311958 100644 +index 5a39069..3ef8662 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1367,6 +1367,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1363,6 +1363,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player { getHandle().playerConnection.sendPacket( packet ); } } diff --git a/CraftBukkit-Patches/0093-Cap-Entity-Collisions.patch b/CraftBukkit-Patches/0092-Cap-Entity-Collisions.patch similarity index 97% rename from CraftBukkit-Patches/0093-Cap-Entity-Collisions.patch rename to CraftBukkit-Patches/0092-Cap-Entity-Collisions.patch index 35e32c8770..ce21b3e4d8 100644 --- a/CraftBukkit-Patches/0093-Cap-Entity-Collisions.patch +++ b/CraftBukkit-Patches/0092-Cap-Entity-Collisions.patch @@ -1,4 +1,4 @@ -From 01391006b22d809e1aa09a6da7ba1e8ef8147b8d Mon Sep 17 00:00:00 2001 +From 9d6db78d4a1e4c06eda42e3e5a772844d15986dd 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/0094-Fix-dispensing-bone-meal-not-having-the-correct-data.patch b/CraftBukkit-Patches/0093-Fix-dispensing-bone-meal-not-having-the-correct-data.patch similarity index 94% rename from CraftBukkit-Patches/0094-Fix-dispensing-bone-meal-not-having-the-correct-data.patch rename to CraftBukkit-Patches/0093-Fix-dispensing-bone-meal-not-having-the-correct-data.patch index 96976aafe3..cd22de2c4f 100644 --- a/CraftBukkit-Patches/0094-Fix-dispensing-bone-meal-not-having-the-correct-data.patch +++ b/CraftBukkit-Patches/0093-Fix-dispensing-bone-meal-not-having-the-correct-data.patch @@ -1,4 +1,4 @@ -From f6b8c550cdb769120c06e9654fedfd0ecfd77f7f Mon Sep 17 00:00:00 2001 +From 530ce2555ba9c02a750ecb17d21c4e57e89a3cb5 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/0095-Spam-Filter-Exclusions.patch b/CraftBukkit-Patches/0094-Spam-Filter-Exclusions.patch similarity index 96% rename from CraftBukkit-Patches/0095-Spam-Filter-Exclusions.patch rename to CraftBukkit-Patches/0094-Spam-Filter-Exclusions.patch index 94886daea7..609c4fc72f 100644 --- a/CraftBukkit-Patches/0095-Spam-Filter-Exclusions.patch +++ b/CraftBukkit-Patches/0094-Spam-Filter-Exclusions.patch @@ -1,11 +1,11 @@ -From 64793a51c1aef0c4f6e04ccbe24b319ffc2d17bb Mon Sep 17 00:00:00 2001 +From 7b576c1e1545ac2ac33fc690b44de8c70cd5eb3e 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 1ee5541..79d8fe0 100644 +index c833842..daa524f 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -850,9 +850,19 @@ public class PlayerConnection implements PacketPlayInListener { diff --git a/CraftBukkit-Patches/0096-Add-Option-to-Silence-CommandBlock-Console.patch b/CraftBukkit-Patches/0095-Add-Option-to-Silence-CommandBlock-Console.patch similarity index 95% rename from CraftBukkit-Patches/0096-Add-Option-to-Silence-CommandBlock-Console.patch rename to CraftBukkit-Patches/0095-Add-Option-to-Silence-CommandBlock-Console.patch index 2af5177a8a..7ead476e15 100644 --- a/CraftBukkit-Patches/0096-Add-Option-to-Silence-CommandBlock-Console.patch +++ b/CraftBukkit-Patches/0095-Add-Option-to-Silence-CommandBlock-Console.patch @@ -1,4 +1,4 @@ -From 83d82f5446b7d93b0295aceabe28023c93ebd648 Mon Sep 17 00:00:00 2001 +From 5b1d11e3500775fdcedbb9d4572072355dccaf18 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/CraftBukkit-Patches/0097-Add-support-for-fetching-hidden-players.patch b/CraftBukkit-Patches/0096-Add-support-for-fetching-hidden-players.patch similarity index 85% rename from CraftBukkit-Patches/0097-Add-support-for-fetching-hidden-players.patch rename to CraftBukkit-Patches/0096-Add-support-for-fetching-hidden-players.patch index b7842459a5..f45bdba8aa 100644 --- a/CraftBukkit-Patches/0097-Add-support-for-fetching-hidden-players.patch +++ b/CraftBukkit-Patches/0096-Add-support-for-fetching-hidden-players.patch @@ -1,14 +1,14 @@ -From 49dad7268b3e4e5c7bc98bac7f306b90da0e667e Mon Sep 17 00:00:00 2001 +From 37fca1a7ed31f10e11b84ed98462fb712a05a28d 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 b311958..0c4153f 100644 +index 3ef8662..5011579 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1373,6 +1373,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1369,6 +1369,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player { { return getHandle().locale; } diff --git a/CraftBukkit-Patches/0098-Allow-Disabling-Creative-Item-Filter.patch b/CraftBukkit-Patches/0097-Allow-Disabling-Creative-Item-Filter.patch similarity index 95% rename from CraftBukkit-Patches/0098-Allow-Disabling-Creative-Item-Filter.patch rename to CraftBukkit-Patches/0097-Allow-Disabling-Creative-Item-Filter.patch index 89cf79e200..da7f768dc1 100644 --- a/CraftBukkit-Patches/0098-Allow-Disabling-Creative-Item-Filter.patch +++ b/CraftBukkit-Patches/0097-Allow-Disabling-Creative-Item-Filter.patch @@ -1,11 +1,11 @@ -From 36abb5407fb6a2f866b44034f04d93301b6b0285 Mon Sep 17 00:00:00 2001 +From b32a5d9137cf640666544ea2467180c5afcf7f1a 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 79d8fe0..c9e99e9 100644 +index daa524f..a0157af 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1499,7 +1499,7 @@ public class PlayerConnection implements PacketPlayInListener { diff --git a/CraftBukkit-Patches/0099-Cap-Channel-Registrations.patch b/CraftBukkit-Patches/0098-Cap-Channel-Registrations.patch similarity index 82% rename from CraftBukkit-Patches/0099-Cap-Channel-Registrations.patch rename to CraftBukkit-Patches/0098-Cap-Channel-Registrations.patch index 98d5fe9dff..2d92dc710b 100644 --- a/CraftBukkit-Patches/0099-Cap-Channel-Registrations.patch +++ b/CraftBukkit-Patches/0098-Cap-Channel-Registrations.patch @@ -1,14 +1,14 @@ -From 6a59c9e9712c8dd542a3a577535a3092268d8868 Mon Sep 17 00:00:00 2001 +From 93205306b35b628668d46294d38f9f005900a880 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 0c4153f..625e6f3 100644 +index 5011579..27d3715 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 { +@@ -1052,6 +1052,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { } public void addChannel(String channel) { diff --git a/CraftBukkit-Patches/0100-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch b/CraftBukkit-Patches/0099-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch similarity index 99% rename from CraftBukkit-Patches/0100-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch rename to CraftBukkit-Patches/0099-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch index ee13ba41d9..65df8162df 100644 --- a/CraftBukkit-Patches/0100-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch +++ b/CraftBukkit-Patches/0099-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch @@ -1,4 +1,4 @@ -From 6c9d15cd9c4cb3a9ce49e30ddf3b1e06a4b42ff2 Mon Sep 17 00:00:00 2001 +From 70f73aba5be31d49fad0972f45dae646103aeb67 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/0101-Unfinalize-the-isDisconnected-method-by-bukkit.patch b/CraftBukkit-Patches/0100-Unfinalize-the-isDisconnected-method-by-bukkit.patch similarity index 90% rename from CraftBukkit-Patches/0101-Unfinalize-the-isDisconnected-method-by-bukkit.patch rename to CraftBukkit-Patches/0100-Unfinalize-the-isDisconnected-method-by-bukkit.patch index 3612c4c587..07e8cd7512 100644 --- a/CraftBukkit-Patches/0101-Unfinalize-the-isDisconnected-method-by-bukkit.patch +++ b/CraftBukkit-Patches/0100-Unfinalize-the-isDisconnected-method-by-bukkit.patch @@ -1,4 +1,4 @@ -From 159aa84f168b08cb2ec2a22fd594bd6f60f20e13 Mon Sep 17 00:00:00 2001 +From f3d9fca51a9fbca5d4d7979e063e85319e00fdd3 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 c9e99e9..20fe15e 100644 +index a0157af..096ac2d 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1885,7 +1885,7 @@ public class PlayerConnection implements PacketPlayInListener { diff --git a/CraftBukkit-Patches/0102-Implement-Silenceable-Lightning-API.patch b/CraftBukkit-Patches/0101-Implement-Silenceable-Lightning-API.patch similarity index 97% rename from CraftBukkit-Patches/0102-Implement-Silenceable-Lightning-API.patch rename to CraftBukkit-Patches/0101-Implement-Silenceable-Lightning-API.patch index 159177a0b4..5c4944eb16 100644 --- a/CraftBukkit-Patches/0102-Implement-Silenceable-Lightning-API.patch +++ b/CraftBukkit-Patches/0101-Implement-Silenceable-Lightning-API.patch @@ -1,4 +1,4 @@ -From 81d47173905b4ca774bc99346725d4d2007af677 Mon Sep 17 00:00:00 2001 +From 586fced5ff68ebbc6a947395bab90b2822f71b4e Mon Sep 17 00:00:00 2001 From: drXor Date: Sun, 23 Feb 2014 16:16:59 -0400 Subject: [PATCH] Implement Silenceable Lightning API @@ -37,7 +37,7 @@ index 66402a0..0671659 100644 //this.world.makeSound(this.locX, this.locY, this.locZ, "ambient.weather.thunder", 10000.0F, 0.8F + this.random.nextFloat() * 0.2F); float pitch = 0.8F + this.random.nextFloat() * 0.2F; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 92c9851..d9e3436 100644 +index 53a5d37..92f7188 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1361,6 +1361,22 @@ public class CraftWorld implements World { diff --git a/CraftBukkit-Patches/0103-Use-one-PermissibleBase-for-all-Command-Blocks.patch b/CraftBukkit-Patches/0102-Use-one-PermissibleBase-for-all-Command-Blocks.patch similarity index 94% rename from CraftBukkit-Patches/0103-Use-one-PermissibleBase-for-all-Command-Blocks.patch rename to CraftBukkit-Patches/0102-Use-one-PermissibleBase-for-all-Command-Blocks.patch index de808a9131..a8f2b8f361 100644 --- a/CraftBukkit-Patches/0103-Use-one-PermissibleBase-for-all-Command-Blocks.patch +++ b/CraftBukkit-Patches/0102-Use-one-PermissibleBase-for-all-Command-Blocks.patch @@ -1,4 +1,4 @@ -From 26c6bf2cd39dc4ac183e63fa860440c7310f5bc9 Mon Sep 17 00:00:00 2001 +From ad71a1a7d850ac7b565ddcc3947db9fd0cfd46f7 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/0104-Prevent-hoppers-from-loading-chunks.patch b/CraftBukkit-Patches/0103-Prevent-hoppers-from-loading-chunks.patch similarity index 93% rename from CraftBukkit-Patches/0104-Prevent-hoppers-from-loading-chunks.patch rename to CraftBukkit-Patches/0103-Prevent-hoppers-from-loading-chunks.patch index e5df4c4345..3677698925 100644 --- a/CraftBukkit-Patches/0104-Prevent-hoppers-from-loading-chunks.patch +++ b/CraftBukkit-Patches/0103-Prevent-hoppers-from-loading-chunks.patch @@ -1,4 +1,4 @@ -From db2418630250c00135a3d87a2ed9572888e8071b Mon Sep 17 00:00:00 2001 +From 7c704f1b5496f68f6f5d0b08a986949aeca38306 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/0105-Guard-Entity-List.patch b/CraftBukkit-Patches/0104-Guard-Entity-List.patch similarity index 97% rename from CraftBukkit-Patches/0105-Guard-Entity-List.patch rename to CraftBukkit-Patches/0104-Guard-Entity-List.patch index 16ccc25c0b..8662007b1f 100644 --- a/CraftBukkit-Patches/0105-Guard-Entity-List.patch +++ b/CraftBukkit-Patches/0104-Guard-Entity-List.patch @@ -1,4 +1,4 @@ -From 66cfb13b1cda70fadcff6584ddf65fefca07bc03 Mon Sep 17 00:00:00 2001 +From 822ad01e4d1c276c88f489d03e4dab3618fbac84 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/0106-Fix-ConcurrentModificationException-while-being-idle.patch b/CraftBukkit-Patches/0105-Fix-ConcurrentModificationException-while-being-idle.patch similarity index 96% rename from CraftBukkit-Patches/0106-Fix-ConcurrentModificationException-while-being-idle.patch rename to CraftBukkit-Patches/0105-Fix-ConcurrentModificationException-while-being-idle.patch index 454917c51b..cccbdd934c 100644 --- a/CraftBukkit-Patches/0106-Fix-ConcurrentModificationException-while-being-idle.patch +++ b/CraftBukkit-Patches/0105-Fix-ConcurrentModificationException-while-being-idle.patch @@ -1,4 +1,4 @@ -From 105ad265e192a49620e3c4ffd7c2703f54bc67ef Mon Sep 17 00:00:00 2001 +From 76b7d0de2ea2ef54ad2ed72fcc8c72c8bfd52672 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/0107-Cancellable-WitherSkull-potion-effect.patch b/CraftBukkit-Patches/0106-Cancellable-WitherSkull-potion-effect.patch similarity index 96% rename from CraftBukkit-Patches/0107-Cancellable-WitherSkull-potion-effect.patch rename to CraftBukkit-Patches/0106-Cancellable-WitherSkull-potion-effect.patch index 1cc2d0c763..5b46f14162 100644 --- a/CraftBukkit-Patches/0107-Cancellable-WitherSkull-potion-effect.patch +++ b/CraftBukkit-Patches/0106-Cancellable-WitherSkull-potion-effect.patch @@ -1,4 +1,4 @@ -From 2f05a58ede2a5032c0fd25773339cbd7a5045481 Mon Sep 17 00:00:00 2001 +From 1960062f0a6803e4894faf6efcf7366d90c8b474 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/0108-Descriptive-kick-reasons-instead-of-Nope.patch b/CraftBukkit-Patches/0107-Descriptive-kick-reasons-instead-of-Nope.patch similarity index 96% rename from CraftBukkit-Patches/0108-Descriptive-kick-reasons-instead-of-Nope.patch rename to CraftBukkit-Patches/0107-Descriptive-kick-reasons-instead-of-Nope.patch index 3cf404c0f2..6e4f0b01a4 100644 --- a/CraftBukkit-Patches/0108-Descriptive-kick-reasons-instead-of-Nope.patch +++ b/CraftBukkit-Patches/0107-Descriptive-kick-reasons-instead-of-Nope.patch @@ -1,4 +1,4 @@ -From 5f56948ccf057ab3c7883d6d6259923b168c9f65 Mon Sep 17 00:00:00 2001 +From 4a61150869e110f840be0425e2e460f336789687 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 b258f15..56b5980 100644 f1 = 0; } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 20fe15e..b04969a 100644 +index 096ac2d..38ed1bf 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -185,7 +185,7 @@ public class PlayerConnection implements PacketPlayInListener { diff --git a/CraftBukkit-Patches/0109-Check-for-manually-prefixed-commands-or-commands-tha.patch b/CraftBukkit-Patches/0108-Check-for-manually-prefixed-commands-or-commands-tha.patch similarity index 95% rename from CraftBukkit-Patches/0109-Check-for-manually-prefixed-commands-or-commands-tha.patch rename to CraftBukkit-Patches/0108-Check-for-manually-prefixed-commands-or-commands-tha.patch index 6cddcac675..792195989d 100644 --- a/CraftBukkit-Patches/0109-Check-for-manually-prefixed-commands-or-commands-tha.patch +++ b/CraftBukkit-Patches/0108-Check-for-manually-prefixed-commands-or-commands-tha.patch @@ -1,4 +1,4 @@ -From 3f79004c8413861b21c2d26d7eeabbe3c2025c24 Mon Sep 17 00:00:00 2001 +From e42ae1ae4a3604569b1ac5b944fd237e7c9f80b6 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/0110-Cap-window-names-to-prevent-client-disconnects.patch b/CraftBukkit-Patches/0109-Cap-window-names-to-prevent-client-disconnects.patch similarity index 93% rename from CraftBukkit-Patches/0110-Cap-window-names-to-prevent-client-disconnects.patch rename to CraftBukkit-Patches/0109-Cap-window-names-to-prevent-client-disconnects.patch index 08ab1d0f42..3852aee2a6 100644 --- a/CraftBukkit-Patches/0110-Cap-window-names-to-prevent-client-disconnects.patch +++ b/CraftBukkit-Patches/0109-Cap-window-names-to-prevent-client-disconnects.patch @@ -1,4 +1,4 @@ -From b0c05e88f85072e7d8f9c00a2fbb1ac2fab2019c Mon Sep 17 00:00:00 2001 +From 61ebe85f3f5c6e3622a1f42bf428e5f7b40ac48c 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/0111-Enable-Improved-Ping-Sending.patch b/CraftBukkit-Patches/0110-Enable-Improved-Ping-Sending.patch similarity index 96% rename from CraftBukkit-Patches/0111-Enable-Improved-Ping-Sending.patch rename to CraftBukkit-Patches/0110-Enable-Improved-Ping-Sending.patch index 8541c8695b..31a41fafad 100644 --- a/CraftBukkit-Patches/0111-Enable-Improved-Ping-Sending.patch +++ b/CraftBukkit-Patches/0110-Enable-Improved-Ping-Sending.patch @@ -1,11 +1,11 @@ -From 10a0d81c95c08d180d8c582305d36718c8b349de Mon Sep 17 00:00:00 2001 +From 65b274583619850e5d5431cbd1b949c662e2e220 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/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 8aa530f..479203a 100644 +index a48a1c0..413af68 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -62,6 +62,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/CraftBukkit-Patches/0112-Configurable-dragon-death-and-wither-spawn-sounds.patch b/CraftBukkit-Patches/0111-Configurable-dragon-death-and-wither-spawn-sounds.patch similarity index 97% rename from CraftBukkit-Patches/0112-Configurable-dragon-death-and-wither-spawn-sounds.patch rename to CraftBukkit-Patches/0111-Configurable-dragon-death-and-wither-spawn-sounds.patch index d2beeb1e00..2b4bb3b056 100644 --- a/CraftBukkit-Patches/0112-Configurable-dragon-death-and-wither-spawn-sounds.patch +++ b/CraftBukkit-Patches/0111-Configurable-dragon-death-and-wither-spawn-sounds.patch @@ -1,4 +1,4 @@ -From 90676712a5c0c79cb6d805d27f8c1cbbb888d594 Mon Sep 17 00:00:00 2001 +From 27e3dab4503d81f04dceb2f54d2d893b06e94426 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/0113-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch b/CraftBukkit-Patches/0112-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch similarity index 89% rename from CraftBukkit-Patches/0113-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch rename to CraftBukkit-Patches/0112-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch index 2355f8b9c8..aeb0b7a826 100644 --- a/CraftBukkit-Patches/0113-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch +++ b/CraftBukkit-Patches/0112-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch @@ -1,4 +1,4 @@ -From a2db9f5be196af9f3daa43b0d8e3b3b54805509e Mon Sep 17 00:00:00 2001 +From 090e9e21488a6d97b4e862a031aaf1f26f1a4a10 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 @@ -6,7 +6,7 @@ Subject: [PATCH] Display 'Spigot' in client crashes, server lists and Mojang diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index d6cd151..03630d1 100644 +index 4c9c3a8..c62d9fe 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -979,7 +979,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo diff --git a/CraftBukkit-Patches/0114-Old-New-Version-Support.patch b/CraftBukkit-Patches/0113-Old-New-Version-Support.patch similarity index 99% rename from CraftBukkit-Patches/0114-Old-New-Version-Support.patch rename to CraftBukkit-Patches/0113-Old-New-Version-Support.patch index d262328449..0805efc23f 100644 --- a/CraftBukkit-Patches/0114-Old-New-Version-Support.patch +++ b/CraftBukkit-Patches/0113-Old-New-Version-Support.patch @@ -1,4 +1,4 @@ -From 8d6e8268b01132a6276f0ee6fd88b1196b14ed66 Mon Sep 17 00:00:00 2001 +From 91421b146b7bd397f5262c71e104e39d074c70e4 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 12 Apr 2014 15:11:15 +1000 Subject: [PATCH] Old / New Version Support. diff --git a/CraftBukkit-Patches/0115-Treat-Bungee-as-Online-Mode.patch b/CraftBukkit-Patches/0114-Treat-Bungee-as-Online-Mode.patch similarity index 94% rename from CraftBukkit-Patches/0115-Treat-Bungee-as-Online-Mode.patch rename to CraftBukkit-Patches/0114-Treat-Bungee-as-Online-Mode.patch index 9fdf5f3b9d..8684701648 100644 --- a/CraftBukkit-Patches/0115-Treat-Bungee-as-Online-Mode.patch +++ b/CraftBukkit-Patches/0114-Treat-Bungee-as-Online-Mode.patch @@ -1,4 +1,4 @@ -From f981d80539e8691a9a91b174e30f16e8107ceff8 Mon Sep 17 00:00:00 2001 +From c8cf8f7c23d03162663e99ac6ee797dd0cc11f45 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/0116-Fix-several-occurances-of-missed-diff.patch b/CraftBukkit-Patches/0115-Fix-several-occurances-of-missed-diff.patch similarity index 97% rename from CraftBukkit-Patches/0116-Fix-several-occurances-of-missed-diff.patch rename to CraftBukkit-Patches/0115-Fix-several-occurances-of-missed-diff.patch index 79fbacaf2c..b493094fd9 100644 --- a/CraftBukkit-Patches/0116-Fix-several-occurances-of-missed-diff.patch +++ b/CraftBukkit-Patches/0115-Fix-several-occurances-of-missed-diff.patch @@ -1,4 +1,4 @@ -From bfba84240f75dc7556bc6705de356da944ffae6a Mon Sep 17 00:00:00 2001 +From 6b4902dcb02b8372794b4bf46e2ad4b362d0df20 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 12 Apr 2014 17:49:14 +1000 Subject: [PATCH] Fix several occurances of missed diff. @@ -44,7 +44,7 @@ index a45bed9..98a4ac7 100644 public void setItemStack(ItemStack itemstack) { diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index b04969a..0804fe7 100644 +index 38ed1bf..c80e06f 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1738,7 +1738,7 @@ public class PlayerConnection implements PacketPlayInListener { diff --git a/CraftBukkit-Patches/0118-Update-Warning.patch b/CraftBukkit-Patches/0116-Update-Warning.patch similarity index 97% rename from CraftBukkit-Patches/0118-Update-Warning.patch rename to CraftBukkit-Patches/0116-Update-Warning.patch index 80cf0343f1..0c1c1c3014 100644 --- a/CraftBukkit-Patches/0118-Update-Warning.patch +++ b/CraftBukkit-Patches/0116-Update-Warning.patch @@ -1,4 +1,4 @@ -From 8409366f56ee25da9876720d06a598726d37a63a Mon Sep 17 00:00:00 2001 +From 7afd8b34ea74393347085a916129d8cc4d188967 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 12 Apr 2014 21:37:12 +1000 Subject: [PATCH] Update Warning diff --git a/CraftBukkit-Patches/0119-Add-Conversion-Message.patch b/CraftBukkit-Patches/0117-Add-Conversion-Message.patch similarity index 91% rename from CraftBukkit-Patches/0119-Add-Conversion-Message.patch rename to CraftBukkit-Patches/0117-Add-Conversion-Message.patch index 60d22092e3..57d7a30306 100644 --- a/CraftBukkit-Patches/0119-Add-Conversion-Message.patch +++ b/CraftBukkit-Patches/0117-Add-Conversion-Message.patch @@ -1,4 +1,4 @@ -From cfa147e2d5e9a2471080e2a427959a6a66471eed Mon Sep 17 00:00:00 2001 +From 0f1eab040327d6363ea70a61e3d15d817fb3bcce 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/CraftBukkit-Patches/0117-Fix-PlayerFishEvent-not-properly-cancelling.-Fixes-B.patch b/CraftBukkit-Patches/0117-Fix-PlayerFishEvent-not-properly-cancelling.-Fixes-B.patch deleted file mode 100644 index 5802c90617..0000000000 --- a/CraftBukkit-Patches/0117-Fix-PlayerFishEvent-not-properly-cancelling.-Fixes-B.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 6f6ef3a221275b26a887af6e87238e4c84ebbd50 Mon Sep 17 00:00:00 2001 -From: myiume -Date: Wed, 19 Feb 2014 15:40:37 +0200 -Subject: [PATCH] Fix PlayerFishEvent not properly cancelling. Fixes - BUKKIT-5245,BUKKIT-5396 - -PlayerFishEvent event states are not properly being cancelled, -the FishingHookEntity being deleted when the event is cancelled, -thus making the event happen. The event states of CAUGHT_ENTITY, -CAUGHT_FISH, FAILED_ATTEMPT, IN_GROUND must keep the -EntityFishingHook alive in order to cancel the event. -Removed the entity despawn lines when event is cancelled -and added a cancelled action for FAILED_ATTEMPT state. - -diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java -index 2ee3f30..197dca1 100644 ---- a/src/main/java/net/minecraft/server/EntityFishingHook.java -+++ b/src/main/java/net/minecraft/server/EntityFishingHook.java -@@ -370,8 +370,6 @@ public class EntityFishingHook extends Entity { - this.world.getServer().getPluginManager().callEvent(playerFishEvent); - - if (playerFishEvent.isCancelled()) { -- this.die(); -- this.owner.hookedFish = null; - return 0; - } - // CraftBukkit end -@@ -394,8 +392,6 @@ public class EntityFishingHook extends Entity { - this.world.getServer().getPluginManager().callEvent(playerFishEvent); - - if (playerFishEvent.isCancelled()) { -- this.die(); -- this.owner.hookedFish = null; - return 0; - } - // CraftBukkit end -@@ -421,8 +417,6 @@ public class EntityFishingHook extends Entity { - this.world.getServer().getPluginManager().callEvent(playerFishEvent); - - if (playerFishEvent.isCancelled()) { -- this.die(); -- this.owner.hookedFish = null; - return 0; - } - // CraftBukkit end -@@ -434,6 +428,10 @@ public class EntityFishingHook extends Entity { - if (b0 == 0) { - PlayerFishEvent playerFishEvent = new PlayerFishEvent((Player) this.owner.getBukkitEntity(), null, (Fish) this.getBukkitEntity(), PlayerFishEvent.State.FAILED_ATTEMPT); - this.world.getServer().getPluginManager().callEvent(playerFishEvent); -+ -+ if (playerFishEvent.isCancelled()) { -+ return 0; -+ } - } - // CraftBukkit end - --- -1.9.1 - diff --git a/CraftBukkit-Patches/0120-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch b/CraftBukkit-Patches/0118-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch similarity index 94% rename from CraftBukkit-Patches/0120-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch rename to CraftBukkit-Patches/0118-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch index e84f3ccc8f..dc7350f103 100644 --- a/CraftBukkit-Patches/0120-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch +++ b/CraftBukkit-Patches/0118-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch @@ -1,4 +1,4 @@ -From a5301c591ee9b8080f46018ae8cf232c5f59f31b Mon Sep 17 00:00:00 2001 +From 2034f8158f80d21ba34a9ad7e7ee55ce8366b52c 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/0121-Print-Stack-on-InternalException.patch b/CraftBukkit-Patches/0119-Print-Stack-on-InternalException.patch similarity index 91% rename from CraftBukkit-Patches/0121-Print-Stack-on-InternalException.patch rename to CraftBukkit-Patches/0119-Print-Stack-on-InternalException.patch index 4bc9fc3348..b11148c3b4 100644 --- a/CraftBukkit-Patches/0121-Print-Stack-on-InternalException.patch +++ b/CraftBukkit-Patches/0119-Print-Stack-on-InternalException.patch @@ -1,4 +1,4 @@ -From 27204e8b4ae6964198ca7fa327fdc43460cf63d6 Mon Sep 17 00:00:00 2001 +From a8d37de28940d4989bc81b28534d5c345e1b6acd 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/0122-Use-Offline-Player-Data-Once-if-Required.patch b/CraftBukkit-Patches/0120-Use-Offline-Player-Data-Once-if-Required.patch similarity index 96% rename from CraftBukkit-Patches/0122-Use-Offline-Player-Data-Once-if-Required.patch rename to CraftBukkit-Patches/0120-Use-Offline-Player-Data-Once-if-Required.patch index e85fedaab9..d834c32fcf 100644 --- a/CraftBukkit-Patches/0122-Use-Offline-Player-Data-Once-if-Required.patch +++ b/CraftBukkit-Patches/0120-Use-Offline-Player-Data-Once-if-Required.patch @@ -1,4 +1,4 @@ -From bc602d48baa44477814f087b0130a07c22f10a10 Mon Sep 17 00:00:00 2001 +From 02e939c4fb70a3f007f80df82eb9da44651c4b2a 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/0123-Use-Provided-Case-for-Non-Existent-Offline-Players.patch b/CraftBukkit-Patches/0121-Use-Provided-Case-for-Non-Existent-Offline-Players.patch similarity index 92% rename from CraftBukkit-Patches/0123-Use-Provided-Case-for-Non-Existent-Offline-Players.patch rename to CraftBukkit-Patches/0121-Use-Provided-Case-for-Non-Existent-Offline-Players.patch index 462e8417a7..f0cb22bd4c 100644 --- a/CraftBukkit-Patches/0123-Use-Provided-Case-for-Non-Existent-Offline-Players.patch +++ b/CraftBukkit-Patches/0121-Use-Provided-Case-for-Non-Existent-Offline-Players.patch @@ -1,4 +1,4 @@ -From c2a3841f11df4d569cf97b81c867b893c922ed9e Mon Sep 17 00:00:00 2001 +From 9ae2b5bcbe267d7fa5ac0f25a1253d1d0d25cf62 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/0124-Check-for-blank-OfflinePlayer-Names.patch b/CraftBukkit-Patches/0122-Check-for-blank-OfflinePlayer-Names.patch similarity index 93% rename from CraftBukkit-Patches/0124-Check-for-blank-OfflinePlayer-Names.patch rename to CraftBukkit-Patches/0122-Check-for-blank-OfflinePlayer-Names.patch index 82faef9bbe..0d3989dcfc 100644 --- a/CraftBukkit-Patches/0124-Check-for-blank-OfflinePlayer-Names.patch +++ b/CraftBukkit-Patches/0122-Check-for-blank-OfflinePlayer-Names.patch @@ -1,4 +1,4 @@ -From ba5f74c45a6b0ae5cfecc65c39f040a5048a63a1 Mon Sep 17 00:00:00 2001 +From 12ec78238d9e0cb0ceee5711e12b769e25d447e8 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/CraftBukkit-Patches/0125-Fix-Player-Banning.patch b/CraftBukkit-Patches/0123-Fix-Player-Banning.patch similarity index 96% rename from CraftBukkit-Patches/0125-Fix-Player-Banning.patch rename to CraftBukkit-Patches/0123-Fix-Player-Banning.patch index 2dddf33119..896ee2e333 100644 --- a/CraftBukkit-Patches/0125-Fix-Player-Banning.patch +++ b/CraftBukkit-Patches/0123-Fix-Player-Banning.patch @@ -1,4 +1,4 @@ -From a6c5c80d264dd85fb8d188a3870e39c7c6312e55 Mon Sep 17 00:00:00 2001 +From e3513c6da6e027909953fbb3b84cc5b8d6e83a42 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/0126-Fix-ban-expire-dates.patch b/CraftBukkit-Patches/0124-Fix-ban-expire-dates.patch similarity index 92% rename from CraftBukkit-Patches/0126-Fix-ban-expire-dates.patch rename to CraftBukkit-Patches/0124-Fix-ban-expire-dates.patch index a5221d6bc3..0541a94dcb 100644 --- a/CraftBukkit-Patches/0126-Fix-ban-expire-dates.patch +++ b/CraftBukkit-Patches/0124-Fix-ban-expire-dates.patch @@ -1,4 +1,4 @@ -From f1a2a2c1dae93dc4565435fe65a23e92451e2c19 Mon Sep 17 00:00:00 2001 +From 7183b78572e9444634503a9ae0dee24797ece055 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/0127-Correct-Ban-Expiration.patch b/CraftBukkit-Patches/0125-Correct-Ban-Expiration.patch similarity index 93% rename from CraftBukkit-Patches/0127-Correct-Ban-Expiration.patch rename to CraftBukkit-Patches/0125-Correct-Ban-Expiration.patch index 964ba19f16..3f6715930a 100644 --- a/CraftBukkit-Patches/0127-Correct-Ban-Expiration.patch +++ b/CraftBukkit-Patches/0125-Correct-Ban-Expiration.patch @@ -1,4 +1,4 @@ -From 713765b93a1ef90c5149c3768fb9fb2e74bb260a Mon Sep 17 00:00:00 2001 +From fd2e1774f783249ea62cefa1749c0087aa368192 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/0128-Convert-Horses-owner-to-UUID.patch b/CraftBukkit-Patches/0126-Convert-Horses-owner-to-UUID.patch similarity index 94% rename from CraftBukkit-Patches/0128-Convert-Horses-owner-to-UUID.patch rename to CraftBukkit-Patches/0126-Convert-Horses-owner-to-UUID.patch index f2a5d0bb10..122402bc78 100644 --- a/CraftBukkit-Patches/0128-Convert-Horses-owner-to-UUID.patch +++ b/CraftBukkit-Patches/0126-Convert-Horses-owner-to-UUID.patch @@ -1,4 +1,4 @@ -From 47209c2017a78db4067a20e28a7a9c266a74fd80 Mon Sep 17 00:00:00 2001 +From b194f0f92b7a35840d48e4c55bcda7de31b326ee 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/0129-Expand-team-API-to-allow-arbitrary-strings.patch b/CraftBukkit-Patches/0127-Expand-team-API-to-allow-arbitrary-strings.patch similarity index 98% rename from CraftBukkit-Patches/0129-Expand-team-API-to-allow-arbitrary-strings.patch rename to CraftBukkit-Patches/0127-Expand-team-API-to-allow-arbitrary-strings.patch index 2b66585dfa..362237f529 100644 --- a/CraftBukkit-Patches/0129-Expand-team-API-to-allow-arbitrary-strings.patch +++ b/CraftBukkit-Patches/0127-Expand-team-API-to-allow-arbitrary-strings.patch @@ -1,4 +1,4 @@ -From 9119dfe5e378281bc33dc8b374f87543fd81fcff Mon Sep 17 00:00:00 2001 +From db62995c98f7a9aec46c832163f88769bccd61dd Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 17 Apr 2014 19:22:22 +1000 Subject: [PATCH] Expand team API to allow arbitrary strings. diff --git a/CraftBukkit-Patches/0130-Add-Score.isScoreSet-Z-API.patch b/CraftBukkit-Patches/0128-Add-Score.isScoreSet-Z-API.patch similarity index 96% rename from CraftBukkit-Patches/0130-Add-Score.isScoreSet-Z-API.patch rename to CraftBukkit-Patches/0128-Add-Score.isScoreSet-Z-API.patch index 4a6fcc858a..bec595ab9b 100644 --- a/CraftBukkit-Patches/0130-Add-Score.isScoreSet-Z-API.patch +++ b/CraftBukkit-Patches/0128-Add-Score.isScoreSet-Z-API.patch @@ -1,4 +1,4 @@ -From 177777bfb4c59668d0e829bf09af7eeb82e942f4 Mon Sep 17 00:00:00 2001 +From a0190354c7938e5153b1aafd3a14c76cfe64f242 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/0131-Log-null-TileEntity-Owner.patch b/CraftBukkit-Patches/0129-Log-null-TileEntity-Owner.patch similarity index 94% rename from CraftBukkit-Patches/0131-Log-null-TileEntity-Owner.patch rename to CraftBukkit-Patches/0129-Log-null-TileEntity-Owner.patch index 3c2b5266f8..1cce88d2c5 100644 --- a/CraftBukkit-Patches/0131-Log-null-TileEntity-Owner.patch +++ b/CraftBukkit-Patches/0129-Log-null-TileEntity-Owner.patch @@ -1,4 +1,4 @@ -From 8aae71832ce1613267432eb152e62848c109c12a Mon Sep 17 00:00:00 2001 +From 2f92f78a8701acb8cdd525f7028d50f0ae70d3e7 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/0132-Don-t-special-case-invalid-usernames-for-UUIDs.patch b/CraftBukkit-Patches/0130-Don-t-special-case-invalid-usernames-for-UUIDs.patch similarity index 94% rename from CraftBukkit-Patches/0132-Don-t-special-case-invalid-usernames-for-UUIDs.patch rename to CraftBukkit-Patches/0130-Don-t-special-case-invalid-usernames-for-UUIDs.patch index 81944703df..9a3a565a84 100644 --- a/CraftBukkit-Patches/0132-Don-t-special-case-invalid-usernames-for-UUIDs.patch +++ b/CraftBukkit-Patches/0130-Don-t-special-case-invalid-usernames-for-UUIDs.patch @@ -1,4 +1,4 @@ -From 27ba3045a7a2dc4b4562a4cd538bd3af1dfde473 Mon Sep 17 00:00:00 2001 +From c0b185d3802a16581921262f7f04c122338ed1d0 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/CraftBukkit-Patches/0133-Convert-player-skulls-async.patch b/CraftBukkit-Patches/0131-Convert-player-skulls-async.patch similarity index 99% rename from CraftBukkit-Patches/0133-Convert-player-skulls-async.patch rename to CraftBukkit-Patches/0131-Convert-player-skulls-async.patch index 12f192b52d..5b7ebea146 100644 --- a/CraftBukkit-Patches/0133-Convert-player-skulls-async.patch +++ b/CraftBukkit-Patches/0131-Convert-player-skulls-async.patch @@ -1,4 +1,4 @@ -From 4a519378aaf3ceca84a0e7f934e8600eb03e2c38 Mon Sep 17 00:00:00 2001 +From dcf9ef2c428d52d5a69cc6a05596620b2b6cd9db 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/0134-Prevent-NoClassDefError-crash-and-notify-on-crash.patch b/CraftBukkit-Patches/0132-Prevent-NoClassDefError-crash-and-notify-on-crash.patch similarity index 97% rename from CraftBukkit-Patches/0134-Prevent-NoClassDefError-crash-and-notify-on-crash.patch rename to CraftBukkit-Patches/0132-Prevent-NoClassDefError-crash-and-notify-on-crash.patch index f09421b644..b60d19f956 100644 --- a/CraftBukkit-Patches/0134-Prevent-NoClassDefError-crash-and-notify-on-crash.patch +++ b/CraftBukkit-Patches/0132-Prevent-NoClassDefError-crash-and-notify-on-crash.patch @@ -1,4 +1,4 @@ -From fe1bdeba27e02e1b0036a334271e6777e26043c0 Mon Sep 17 00:00:00 2001 +From 839055d48c9a99bd1d60feff14656d9e7354ab22 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/CraftBukkit-Patches/0135-Check-Skull-canPlace.patch b/CraftBukkit-Patches/0133-Check-Skull-canPlace.patch similarity index 92% rename from CraftBukkit-Patches/0135-Check-Skull-canPlace.patch rename to CraftBukkit-Patches/0133-Check-Skull-canPlace.patch index 2a2fc65e84..49d840303e 100644 --- a/CraftBukkit-Patches/0135-Check-Skull-canPlace.patch +++ b/CraftBukkit-Patches/0133-Check-Skull-canPlace.patch @@ -1,4 +1,4 @@ -From 8d34503e826ede14b337454e9188bc833ed5cbda Mon Sep 17 00:00:00 2001 +From 3655091ed2427de66e8fe1bc115b824c47f99404 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/0136-Don-t-let-trees-replace-any-block.patch b/CraftBukkit-Patches/0134-Don-t-let-trees-replace-any-block.patch similarity index 95% rename from CraftBukkit-Patches/0136-Don-t-let-trees-replace-any-block.patch rename to CraftBukkit-Patches/0134-Don-t-let-trees-replace-any-block.patch index 87c3b1bdb7..df4af48329 100644 --- a/CraftBukkit-Patches/0136-Don-t-let-trees-replace-any-block.patch +++ b/CraftBukkit-Patches/0134-Don-t-let-trees-replace-any-block.patch @@ -1,4 +1,4 @@ -From cd96be6bb68af25e5498e24a758c602d681b506f Mon Sep 17 00:00:00 2001 +From fb930fccd170e6b184946f4e71119e0bce1520a8 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. diff --git a/CraftBukkit-Patches/0137-Fix-race-condition-that-could-kill-connections-befor.patch b/CraftBukkit-Patches/0135-Fix-race-condition-that-could-kill-connections-befor.patch similarity index 97% rename from CraftBukkit-Patches/0137-Fix-race-condition-that-could-kill-connections-befor.patch rename to CraftBukkit-Patches/0135-Fix-race-condition-that-could-kill-connections-befor.patch index 211b0b3ae6..5747838565 100644 --- a/CraftBukkit-Patches/0137-Fix-race-condition-that-could-kill-connections-befor.patch +++ b/CraftBukkit-Patches/0135-Fix-race-condition-that-could-kill-connections-befor.patch @@ -1,4 +1,4 @@ -From ea2b784ee80f96adc590a68530786ab433efdb55 Mon Sep 17 00:00:00 2001 +From fd151cc8d3920be62b8dcdbeb29a78da5a98ac69 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/0138-Configurable-UserCache-cap.patch b/CraftBukkit-Patches/0136-Configurable-UserCache-cap.patch similarity index 95% rename from CraftBukkit-Patches/0138-Configurable-UserCache-cap.patch rename to CraftBukkit-Patches/0136-Configurable-UserCache-cap.patch index 2fb607f14f..27c5128561 100644 --- a/CraftBukkit-Patches/0138-Configurable-UserCache-cap.patch +++ b/CraftBukkit-Patches/0136-Configurable-UserCache-cap.patch @@ -1,4 +1,4 @@ -From d31b06968d185d3f4f03f6c90ada1480415e3aca Mon Sep 17 00:00:00 2001 +From 11686f69378066eb0f63e19ac2b83314d8669fc8 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/0139-Implement-PlayerSpawnLocationEvent.patch b/CraftBukkit-Patches/0137-Implement-PlayerSpawnLocationEvent.patch similarity index 96% rename from CraftBukkit-Patches/0139-Implement-PlayerSpawnLocationEvent.patch rename to CraftBukkit-Patches/0137-Implement-PlayerSpawnLocationEvent.patch index 6b91ec55b3..854436ff05 100644 --- a/CraftBukkit-Patches/0139-Implement-PlayerSpawnLocationEvent.patch +++ b/CraftBukkit-Patches/0137-Implement-PlayerSpawnLocationEvent.patch @@ -1,4 +1,4 @@ -From 1e6c4cd85b190314a6c15c05fd2b006270c4fcbc Mon Sep 17 00:00:00 2001 +From 7d22666fbdc330cf52f1beaebccb550ee60e0aa7 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/0140-Cap-Objective-Score-Length.patch b/CraftBukkit-Patches/0138-Cap-Objective-Score-Length.patch similarity index 94% rename from CraftBukkit-Patches/0140-Cap-Objective-Score-Length.patch rename to CraftBukkit-Patches/0138-Cap-Objective-Score-Length.patch index 89c0174d57..c498961686 100644 --- a/CraftBukkit-Patches/0140-Cap-Objective-Score-Length.patch +++ b/CraftBukkit-Patches/0138-Cap-Objective-Score-Length.patch @@ -1,4 +1,4 @@ -From af84186d14145f69520f8c9a58b2f6434e0c7e06 Mon Sep 17 00:00:00 2001 +From c74bd3384bf81012a0eb121ec2f27b047e1c0b77 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/0141-Process-conversation-input-on-the-main-thread.-Fixes.patch b/CraftBukkit-Patches/0139-Process-conversation-input-on-the-main-thread.-Fixes.patch similarity index 93% rename from CraftBukkit-Patches/0141-Process-conversation-input-on-the-main-thread.-Fixes.patch rename to CraftBukkit-Patches/0139-Process-conversation-input-on-the-main-thread.-Fixes.patch index 8114440795..a26c58faf3 100644 --- a/CraftBukkit-Patches/0141-Process-conversation-input-on-the-main-thread.-Fixes.patch +++ b/CraftBukkit-Patches/0139-Process-conversation-input-on-the-main-thread.-Fixes.patch @@ -1,4 +1,4 @@ -From a9b22efe398e06c3376a674f74e63ad12786f2b7 Mon Sep 17 00:00:00 2001 +From 38b9953601d971d2dc45f32d10a205e6eaf215f2 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 @@ -6,7 +6,7 @@ Subject: [PATCH] Process conversation input on the main thread. Fixes diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 0804fe7..9491101 100644 +index c80e06f..024ec84 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -835,7 +835,18 @@ public class PlayerConnection implements PacketPlayInListener { diff --git a/CraftBukkit-Patches/0142-Configurable-save-on-stop-only-for-UserCache.patch b/CraftBukkit-Patches/0140-Configurable-save-on-stop-only-for-UserCache.patch similarity index 95% rename from CraftBukkit-Patches/0142-Configurable-save-on-stop-only-for-UserCache.patch rename to CraftBukkit-Patches/0140-Configurable-save-on-stop-only-for-UserCache.patch index 158daac645..d37f2a3cb1 100644 --- a/CraftBukkit-Patches/0142-Configurable-save-on-stop-only-for-UserCache.patch +++ b/CraftBukkit-Patches/0140-Configurable-save-on-stop-only-for-UserCache.patch @@ -1,11 +1,11 @@ -From 9cdc944a0cb40b8d53cd12d948db27c4fa569ef2 Mon Sep 17 00:00:00 2001 +From 45094802bda666b59731622591c78064286efa95 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/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 03630d1..aa459a5 100644 +index c62d9fe..d5d9ebc 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -419,6 +419,13 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo diff --git a/CraftBukkit-Patches/0143-Prevent-Unbounded-IntCache-Growth.patch b/CraftBukkit-Patches/0141-Prevent-Unbounded-IntCache-Growth.patch similarity index 97% rename from CraftBukkit-Patches/0143-Prevent-Unbounded-IntCache-Growth.patch rename to CraftBukkit-Patches/0141-Prevent-Unbounded-IntCache-Growth.patch index f030d1d698..b8ff088202 100644 --- a/CraftBukkit-Patches/0143-Prevent-Unbounded-IntCache-Growth.patch +++ b/CraftBukkit-Patches/0141-Prevent-Unbounded-IntCache-Growth.patch @@ -1,4 +1,4 @@ -From fc0bdcd14ce8e649c564e34505da292481d4d83b Mon Sep 17 00:00:00 2001 +From 60944a311fc57886c97c4a7c6c74ca605320b32f 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/0144-Fix-explosions-not-moving-invulnerable-entities.patch b/CraftBukkit-Patches/0142-Fix-explosions-not-moving-invulnerable-entities.patch similarity index 94% rename from CraftBukkit-Patches/0144-Fix-explosions-not-moving-invulnerable-entities.patch rename to CraftBukkit-Patches/0142-Fix-explosions-not-moving-invulnerable-entities.patch index 2b80216995..30054f2ed1 100644 --- a/CraftBukkit-Patches/0144-Fix-explosions-not-moving-invulnerable-entities.patch +++ b/CraftBukkit-Patches/0142-Fix-explosions-not-moving-invulnerable-entities.patch @@ -1,4 +1,4 @@ -From 27c15c1043d53ea191c58a52825b570a27b94b20 Mon Sep 17 00:00:00 2001 +From c4145784b7b40a92675b5def974a12ed996a0817 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Thu, 26 Jun 2014 14:29:11 +0100 Subject: [PATCH] Fix explosions not moving invulnerable entities diff --git a/CraftBukkit-Patches/0145-Add-damager-to-the-unhandled-error.patch b/CraftBukkit-Patches/0143-Add-damager-to-the-unhandled-error.patch similarity index 91% rename from CraftBukkit-Patches/0145-Add-damager-to-the-unhandled-error.patch rename to CraftBukkit-Patches/0143-Add-damager-to-the-unhandled-error.patch index 4f0be19fb9..64f9f55be9 100644 --- a/CraftBukkit-Patches/0145-Add-damager-to-the-unhandled-error.patch +++ b/CraftBukkit-Patches/0143-Add-damager-to-the-unhandled-error.patch @@ -1,11 +1,11 @@ -From 93d639c32e8655d78c9944ddf8a19f5fce9b7832 Mon Sep 17 00:00:00 2001 +From 527c4beb51f768863a2acceb5a30e9a159c49dcd 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/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 6cc8a2d..feac545 100644 +index 029652d..d452df7 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -207,7 +207,7 @@ public class CraftEventFactory { @@ -17,7 +17,7 @@ index 6cc8a2d..feac545 100644 } return callPlayerInteractEvent(who, action, 0, 256, 0, 0, itemstack); } -@@ -479,7 +479,7 @@ public class CraftEventFactory { +@@ -484,7 +484,7 @@ public class CraftEventFactory { if (source == DamageSource.CACTUS) { cause = DamageCause.CONTACT; } else { @@ -26,7 +26,7 @@ index 6cc8a2d..feac545 100644 } EntityDamageEvent event = callEvent(new EntityDamageByBlockEvent(damager, entity.getBukkitEntity(), cause, modifiers, modifierFunctions)); if (!event.isCancelled()) { -@@ -497,7 +497,7 @@ public class CraftEventFactory { +@@ -502,7 +502,7 @@ public class CraftEventFactory { } else if (source == DamageSource.FALL) { cause = DamageCause.FALL; } else { @@ -35,7 +35,7 @@ index 6cc8a2d..feac545 100644 } EntityDamageEvent event = callEvent(new EntityDamageByEntityEvent(damager, entity.getBukkitEntity(), cause, modifiers, modifierFunctions)); if (!event.isCancelled()) { -@@ -535,7 +535,7 @@ public class CraftEventFactory { +@@ -540,7 +540,7 @@ public class CraftEventFactory { return callEntityDamageEvent(null, entity, cause, modifiers, modifierFunctions); } diff --git a/CraftBukkit-Patches/0146-Cross-World-Entity-Teleportation.patch b/CraftBukkit-Patches/0144-Cross-World-Entity-Teleportation.patch similarity index 80% rename from CraftBukkit-Patches/0146-Cross-World-Entity-Teleportation.patch rename to CraftBukkit-Patches/0144-Cross-World-Entity-Teleportation.patch index 8e3978f13c..3986c594b1 100644 --- a/CraftBukkit-Patches/0146-Cross-World-Entity-Teleportation.patch +++ b/CraftBukkit-Patches/0144-Cross-World-Entity-Teleportation.patch @@ -1,4 +1,4 @@ -From 81b0beb9e6bceb7a05a843bbe59ec6e20425bd38 Mon Sep 17 00:00:00 2001 +From 21cec57a34f6b3de2d0147f53fe47b799d65995c 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 @@ -6,12 +6,12 @@ Subject: [PATCH] Cross World Entity Teleportation Use Entity.teleportTo for cross-world teleportation in CraftEntity. diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 96d763b..26a6253 100644 +index ce18aea..1c8099d 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -@@ -205,7 +205,14 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { - return false; - } +@@ -208,7 +208,14 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { + // If this entity is riding another entity, we must dismount before teleporting. + entity.mount(null); - entity.world = ((CraftWorld) location.getWorld()).getHandle(); + // Spigot start diff --git a/CraftBukkit-Patches/0147-Limit-block-placement-interaction-packets.patch b/CraftBukkit-Patches/0145-Limit-block-placement-interaction-packets.patch similarity index 96% rename from CraftBukkit-Patches/0147-Limit-block-placement-interaction-packets.patch rename to CraftBukkit-Patches/0145-Limit-block-placement-interaction-packets.patch index 21cd8cc159..c3169a9546 100644 --- a/CraftBukkit-Patches/0147-Limit-block-placement-interaction-packets.patch +++ b/CraftBukkit-Patches/0145-Limit-block-placement-interaction-packets.patch @@ -1,11 +1,11 @@ -From 9bdd9990787595e243785731f966254860a20a3a Mon Sep 17 00:00:00 2001 +From df01fcb7e6f82f93930252373a4b6c1dc0f0b09b 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/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 9491101..20c49e3 100644 +index 024ec84..bd61823 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -573,7 +573,20 @@ public class PlayerConnection implements PacketPlayInListener { diff --git a/CraftBukkit-Patches/0148-Better-item-validation.patch b/CraftBukkit-Patches/0146-Better-item-validation.patch similarity index 98% rename from CraftBukkit-Patches/0148-Better-item-validation.patch rename to CraftBukkit-Patches/0146-Better-item-validation.patch index 86251d27db..974060b919 100644 --- a/CraftBukkit-Patches/0148-Better-item-validation.patch +++ b/CraftBukkit-Patches/0146-Better-item-validation.patch @@ -1,4 +1,4 @@ -From c09d735f8bf44a0e32ca62cf6179d4acae8461a2 Mon Sep 17 00:00:00 2001 +From 9fb3a495d25e376af9ecfaac0843ba6e339cc7d8 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/0149-Further-Seed-Customisation.patch b/CraftBukkit-Patches/0147-Further-Seed-Customisation.patch similarity index 97% rename from CraftBukkit-Patches/0149-Further-Seed-Customisation.patch rename to CraftBukkit-Patches/0147-Further-Seed-Customisation.patch index 11baf8874c..730b2ac326 100644 --- a/CraftBukkit-Patches/0149-Further-Seed-Customisation.patch +++ b/CraftBukkit-Patches/0147-Further-Seed-Customisation.patch @@ -1,4 +1,4 @@ -From b383c6bc3a5c83451554b0aa7889ad0f5a114acf Mon Sep 17 00:00:00 2001 +From feb0cb28efeb693ea946ea7cf1b8fdb752961e40 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/0150-Disable-ResourceLeakDetector.patch b/CraftBukkit-Patches/0148-Disable-ResourceLeakDetector.patch similarity index 91% rename from CraftBukkit-Patches/0150-Disable-ResourceLeakDetector.patch rename to CraftBukkit-Patches/0148-Disable-ResourceLeakDetector.patch index 639725271d..58daa74a9b 100644 --- a/CraftBukkit-Patches/0150-Disable-ResourceLeakDetector.patch +++ b/CraftBukkit-Patches/0148-Disable-ResourceLeakDetector.patch @@ -1,4 +1,4 @@ -From 7274e6aade5fb13d9d54b8ff5a501d5aa8cbd526 Mon Sep 17 00:00:00 2001 +From 2a33b22f343128fadf4803e1dd47a25c6f44cca1 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 8 Jul 2014 09:01:50 +1000 Subject: [PATCH] Disable ResourceLeakDetector @@ -6,7 +6,7 @@ Subject: [PATCH] Disable ResourceLeakDetector Hopefully no plugins are somehow leaking buffers, but disabling the ResourceLeakDetector is a good thing for performance of the Netty IO subsytem (it's been disabled in BungeeCord for a while now). diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index aa459a5..f682f76 100644 +index d5d9ebc..b905c6e 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -115,6 +115,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo diff --git a/CraftBukkit-Patches/0151-Add-More-Information-to-session.lock-Errors.patch b/CraftBukkit-Patches/0149-Add-More-Information-to-session.lock-Errors.patch similarity index 96% rename from CraftBukkit-Patches/0151-Add-More-Information-to-session.lock-Errors.patch rename to CraftBukkit-Patches/0149-Add-More-Information-to-session.lock-Errors.patch index e696c2f491..dcbed0b585 100644 --- a/CraftBukkit-Patches/0151-Add-More-Information-to-session.lock-Errors.patch +++ b/CraftBukkit-Patches/0149-Add-More-Information-to-session.lock-Errors.patch @@ -1,4 +1,4 @@ -From 0ff525c958d2e06490603a320436af1576b3b862 Mon Sep 17 00:00:00 2001 +From 0352bb6d83061788f7a36a046ebe52900203a856 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/0152-Safer-JSON-Loading.patch b/CraftBukkit-Patches/0150-Safer-JSON-Loading.patch similarity index 97% rename from CraftBukkit-Patches/0152-Safer-JSON-Loading.patch rename to CraftBukkit-Patches/0150-Safer-JSON-Loading.patch index ad7f62cb16..7cfe99121c 100644 --- a/CraftBukkit-Patches/0152-Safer-JSON-Loading.patch +++ b/CraftBukkit-Patches/0150-Safer-JSON-Loading.patch @@ -1,4 +1,4 @@ -From 4be74f79773f25c1b4551499ee4b476512af9f19 Mon Sep 17 00:00:00 2001 +From 03360060334aa3ea4a8741bd468fbddbed1d426e 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/0153-Fix-Slow-Loading-Libraries.patch b/CraftBukkit-Patches/0151-Fix-Slow-Loading-Libraries.patch similarity index 95% rename from CraftBukkit-Patches/0153-Fix-Slow-Loading-Libraries.patch rename to CraftBukkit-Patches/0151-Fix-Slow-Loading-Libraries.patch index a601b6a912..60548664ef 100644 --- a/CraftBukkit-Patches/0153-Fix-Slow-Loading-Libraries.patch +++ b/CraftBukkit-Patches/0151-Fix-Slow-Loading-Libraries.patch @@ -1,4 +1,4 @@ -From 39587c6b33c6c34012bcd01324c7e1bf01a5c75e Mon Sep 17 00:00:00 2001 +From 45dc51a6a1340be61e64c6d07a6d674ade297527 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/0154-Add-CommandLine-EULA-Flag.patch b/CraftBukkit-Patches/0152-Add-CommandLine-EULA-Flag.patch similarity index 96% rename from CraftBukkit-Patches/0154-Add-CommandLine-EULA-Flag.patch rename to CraftBukkit-Patches/0152-Add-CommandLine-EULA-Flag.patch index be3258a44d..5dbe4fb4c4 100644 --- a/CraftBukkit-Patches/0154-Add-CommandLine-EULA-Flag.patch +++ b/CraftBukkit-Patches/0152-Add-CommandLine-EULA-Flag.patch @@ -1,4 +1,4 @@ -From e71f9d9c02ecbd2b939ee82c5a6b651209870616 Mon Sep 17 00:00:00 2001 +From 76437544401352d9451798db14bf90bc48512b0c 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/0155-Fix-misnamed-function-from-1.7.10-update.patch b/CraftBukkit-Patches/0153-Fix-misnamed-function-from-1.7.10-update.patch similarity index 92% rename from CraftBukkit-Patches/0155-Fix-misnamed-function-from-1.7.10-update.patch rename to CraftBukkit-Patches/0153-Fix-misnamed-function-from-1.7.10-update.patch index 9c448bb30b..4718e6ef16 100644 --- a/CraftBukkit-Patches/0155-Fix-misnamed-function-from-1.7.10-update.patch +++ b/CraftBukkit-Patches/0153-Fix-misnamed-function-from-1.7.10-update.patch @@ -1,4 +1,4 @@ -From 2ea7ca473fd5be5078e2fb0eb72d50abb9cb8276 Mon Sep 17 00:00:00 2001 +From 381dc3a30d120b3e4e37c8b6841f380d3cf61337 Mon Sep 17 00:00:00 2001 From: Suddenly Date: Mon, 14 Jul 2014 23:43:10 +0100 Subject: [PATCH] Fix misnamed function from 1.7.10 update diff --git a/CraftBukkit-Patches/0156-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch b/CraftBukkit-Patches/0154-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch similarity index 94% rename from CraftBukkit-Patches/0156-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch rename to CraftBukkit-Patches/0154-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch index e01c27bccf..0640463de3 100644 --- a/CraftBukkit-Patches/0156-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch +++ b/CraftBukkit-Patches/0154-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch @@ -1,4 +1,4 @@ -From feb92c0e8b761aac7a0598b39c6e300df0d18ada Mon Sep 17 00:00:00 2001 +From 0f0f2a4db11224c03ca7a1d867ac320cbfe7f33e 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/0157-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch b/CraftBukkit-Patches/0155-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch similarity index 95% rename from CraftBukkit-Patches/0157-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch rename to CraftBukkit-Patches/0155-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch index d23eb75365..08c79131e8 100644 --- a/CraftBukkit-Patches/0157-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch +++ b/CraftBukkit-Patches/0155-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch @@ -1,4 +1,4 @@ -From a6130705a785773fb3423d9b075ba85941d40ab2 Mon Sep 17 00:00:00 2001 +From 883c039f5c4c75122c4d57bcf04cb3a4bce25812 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 @@ -26,7 +26,7 @@ index aba3748..22aac7b 100644 EntityOcelot entityocelot = new EntityOcelot(this.world); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index d9e3436..d60a79a 100644 +index 92f7188..ea786ae 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1056,6 +1056,12 @@ public class CraftWorld implements World { diff --git a/CraftBukkit-Patches/0158-Prevent-a-crash-involving-attributes.patch b/CraftBukkit-Patches/0156-Prevent-a-crash-involving-attributes.patch similarity index 89% rename from CraftBukkit-Patches/0158-Prevent-a-crash-involving-attributes.patch rename to CraftBukkit-Patches/0156-Prevent-a-crash-involving-attributes.patch index 7956eeb24f..e7c6ab9c70 100644 --- a/CraftBukkit-Patches/0158-Prevent-a-crash-involving-attributes.patch +++ b/CraftBukkit-Patches/0156-Prevent-a-crash-involving-attributes.patch @@ -1,14 +1,14 @@ -From af80849ef89df89030f083a5cc14ae2faa736bcb Mon Sep 17 00:00:00 2001 +From 4adc286003bacf2753fd8eb1361590756e68bbae 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/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 625e6f3..1127461 100644 +index 27d3715..e7569c6 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1291,7 +1291,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1287,7 +1287,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { break; } } diff --git a/CraftBukkit-Patches/0159-Fix-IP-banning.patch b/CraftBukkit-Patches/0157-Fix-IP-banning.patch similarity index 94% rename from CraftBukkit-Patches/0159-Fix-IP-banning.patch rename to CraftBukkit-Patches/0157-Fix-IP-banning.patch index 2086960ef2..a301c1f960 100644 --- a/CraftBukkit-Patches/0159-Fix-IP-banning.patch +++ b/CraftBukkit-Patches/0157-Fix-IP-banning.patch @@ -1,4 +1,4 @@ -From 95177bb2a7b080af6852eb63b4d4e6f4c16bf882 Mon Sep 17 00:00:00 2001 +From e70930bd5e41b82f5281b5faea46569be0985296 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Sat, 19 Jul 2014 22:13:44 +0100 Subject: [PATCH] Fix IP banning diff --git a/CraftBukkit-Patches/0160-Make-moved-wrongly-limit-configurable.patch b/CraftBukkit-Patches/0158-Make-moved-wrongly-limit-configurable.patch similarity index 94% rename from CraftBukkit-Patches/0160-Make-moved-wrongly-limit-configurable.patch rename to CraftBukkit-Patches/0158-Make-moved-wrongly-limit-configurable.patch index a4e97205ac..ae120bb3eb 100644 --- a/CraftBukkit-Patches/0160-Make-moved-wrongly-limit-configurable.patch +++ b/CraftBukkit-Patches/0158-Make-moved-wrongly-limit-configurable.patch @@ -1,11 +1,11 @@ -From c8fe049a4daea2cf9b6c6e61009f18a7477e0a5e Mon Sep 17 00:00:00 2001 +From 8d4f00dacfa223c10ee46be227d3946efebd3716 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/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 20c49e3..cd4f0c9 100644 +index bd61823..845fbc4 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -399,7 +399,8 @@ public class PlayerConnection implements PacketPlayInListener { diff --git a/CraftBukkit-Patches/0161-Fix-Null-Tile-Entity-Worlds.patch b/CraftBukkit-Patches/0159-Fix-Null-Tile-Entity-Worlds.patch similarity index 91% rename from CraftBukkit-Patches/0161-Fix-Null-Tile-Entity-Worlds.patch rename to CraftBukkit-Patches/0159-Fix-Null-Tile-Entity-Worlds.patch index bdd0d31be8..a0448f9f4b 100644 --- a/CraftBukkit-Patches/0161-Fix-Null-Tile-Entity-Worlds.patch +++ b/CraftBukkit-Patches/0159-Fix-Null-Tile-Entity-Worlds.patch @@ -1,4 +1,4 @@ -From 9f9d45256684b586ca9bb5b0e6712e49d5eb1663 Mon Sep 17 00:00:00 2001 +From ce39527e6d8c33cfbebecbd57dc29f4edbe1955e 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/CraftBukkit-Patches/0162-Make-moved-too-quickly-limit-configurable.patch b/CraftBukkit-Patches/0160-Make-moved-too-quickly-limit-configurable.patch similarity index 95% rename from CraftBukkit-Patches/0162-Make-moved-too-quickly-limit-configurable.patch rename to CraftBukkit-Patches/0160-Make-moved-too-quickly-limit-configurable.patch index e45d4d504d..d25a79be67 100644 --- a/CraftBukkit-Patches/0162-Make-moved-too-quickly-limit-configurable.patch +++ b/CraftBukkit-Patches/0160-Make-moved-too-quickly-limit-configurable.patch @@ -1,11 +1,11 @@ -From e69ef558ecb3e2bc989b8421d643234ab67be6f3 Mon Sep 17 00:00:00 2001 +From 49e79efebf7438701703e3d67702ae8af2f657a7 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/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index cd4f0c9..97037ff 100644 +index 845fbc4..2b764b5 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -371,7 +371,8 @@ public class PlayerConnection implements PacketPlayInListener { diff --git a/CraftBukkit-Patches/0163-Alternative-Hopper-Ticking.patch b/CraftBukkit-Patches/0161-Alternative-Hopper-Ticking.patch similarity index 99% rename from CraftBukkit-Patches/0163-Alternative-Hopper-Ticking.patch rename to CraftBukkit-Patches/0161-Alternative-Hopper-Ticking.patch index 6f38591af6..0b571a5339 100644 --- a/CraftBukkit-Patches/0163-Alternative-Hopper-Ticking.patch +++ b/CraftBukkit-Patches/0161-Alternative-Hopper-Ticking.patch @@ -1,4 +1,4 @@ -From 924c5dc46c27c82e5ec888ef859514316ab8261b Mon Sep 17 00:00:00 2001 +From 8ac8d7c3b4e9357cb9302ce748209f7a4e3ee73c Mon Sep 17 00:00:00 2001 From: "Evan A. Haskell" Date: Sat, 19 Apr 2014 16:58:26 -0400 Subject: [PATCH] Alternative Hopper Ticking diff --git a/CraftBukkit-Patches/0164-Apply-NBTReadLimiter-to-more-things.patch b/CraftBukkit-Patches/0162-Apply-NBTReadLimiter-to-more-things.patch similarity index 96% rename from CraftBukkit-Patches/0164-Apply-NBTReadLimiter-to-more-things.patch rename to CraftBukkit-Patches/0162-Apply-NBTReadLimiter-to-more-things.patch index ac38c98ee9..019cd28c68 100644 --- a/CraftBukkit-Patches/0164-Apply-NBTReadLimiter-to-more-things.patch +++ b/CraftBukkit-Patches/0162-Apply-NBTReadLimiter-to-more-things.patch @@ -1,4 +1,4 @@ -From d3491f6de596ea5a2b9a715094953c1a43433e42 Mon Sep 17 00:00:00 2001 +From 74b85c0aca746e6e700dbac22ab39bfefd529d6e 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/0165-Allow-Attribute-Capping.patch b/CraftBukkit-Patches/0163-Allow-Attribute-Capping.patch similarity index 98% rename from CraftBukkit-Patches/0165-Allow-Attribute-Capping.patch rename to CraftBukkit-Patches/0163-Allow-Attribute-Capping.patch index 8807f27d48..5b4ef17493 100644 --- a/CraftBukkit-Patches/0165-Allow-Attribute-Capping.patch +++ b/CraftBukkit-Patches/0163-Allow-Attribute-Capping.patch @@ -1,4 +1,4 @@ -From a6fb28006bebb043851422b8ab7c27b924c041c6 Mon Sep 17 00:00:00 2001 +From 207d40ff40ffe0d79dc6b2bc544628cb335d41ee 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/0166-Add-an-option-for-a-global-cache-for-any-request-on-.patch b/CraftBukkit-Patches/0164-Add-an-option-for-a-global-cache-for-any-request-on-.patch similarity index 99% rename from CraftBukkit-Patches/0166-Add-an-option-for-a-global-cache-for-any-request-on-.patch rename to CraftBukkit-Patches/0164-Add-an-option-for-a-global-cache-for-any-request-on-.patch index e60faea2a0..c1abd39a93 100644 --- a/CraftBukkit-Patches/0166-Add-an-option-for-a-global-cache-for-any-request-on-.patch +++ b/CraftBukkit-Patches/0164-Add-an-option-for-a-global-cache-for-any-request-on-.patch @@ -1,4 +1,4 @@ -From 129f58f3f8ba975fbe8a487f45b0dce22c229b88 Mon Sep 17 00:00:00 2001 +From 1ef83f75c9811df154608bc23f6110e80a6220b6 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Mon, 28 Jul 2014 11:42:11 +0100 Subject: [PATCH] Add an option for a global cache for any request on Mojang's diff --git a/CraftBukkit-Patches/0167-Only-fetch-an-online-UUID-in-online-mode.patch b/CraftBukkit-Patches/0165-Only-fetch-an-online-UUID-in-online-mode.patch similarity index 96% rename from CraftBukkit-Patches/0167-Only-fetch-an-online-UUID-in-online-mode.patch rename to CraftBukkit-Patches/0165-Only-fetch-an-online-UUID-in-online-mode.patch index 0f38f30b36..9e2dfa0582 100644 --- a/CraftBukkit-Patches/0167-Only-fetch-an-online-UUID-in-online-mode.patch +++ b/CraftBukkit-Patches/0165-Only-fetch-an-online-UUID-in-online-mode.patch @@ -1,4 +1,4 @@ -From 9ca6ab77b96d4f00ed0f5361bbf0a92957de9722 Mon Sep 17 00:00:00 2001 +From 4d0eed9b2504627191687de5059c075fc6f7bebc 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 diff --git a/CraftBukkit-Patches/0168-Filter-attribute-modifiers-which-cause-the-attribute.patch b/CraftBukkit-Patches/0166-Filter-attribute-modifiers-which-cause-the-attribute.patch similarity index 99% rename from CraftBukkit-Patches/0168-Filter-attribute-modifiers-which-cause-the-attribute.patch rename to CraftBukkit-Patches/0166-Filter-attribute-modifiers-which-cause-the-attribute.patch index b0f521643c..f80324a00a 100644 --- a/CraftBukkit-Patches/0168-Filter-attribute-modifiers-which-cause-the-attribute.patch +++ b/CraftBukkit-Patches/0166-Filter-attribute-modifiers-which-cause-the-attribute.patch @@ -1,4 +1,4 @@ -From 7f6272db9e5c1da260a12fd22fc34a0f6aa25af3 Mon Sep 17 00:00:00 2001 +From 4f816d2087b144773eb27df9002b0e1da8806d8f 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/0169-Fix-missed-diff-from-Minecraft-1.3.1-update.patch b/CraftBukkit-Patches/0167-Fix-missed-diff-from-Minecraft-1.3.1-update.patch similarity index 93% rename from CraftBukkit-Patches/0169-Fix-missed-diff-from-Minecraft-1.3.1-update.patch rename to CraftBukkit-Patches/0167-Fix-missed-diff-from-Minecraft-1.3.1-update.patch index f1dc21492c..35be1554b3 100644 --- a/CraftBukkit-Patches/0169-Fix-missed-diff-from-Minecraft-1.3.1-update.patch +++ b/CraftBukkit-Patches/0167-Fix-missed-diff-from-Minecraft-1.3.1-update.patch @@ -1,4 +1,4 @@ -From dac5ed48c55e2ea70288e118a9f2d2043fe4bb8d Mon Sep 17 00:00:00 2001 +From cb351dfb0513090ecde0311cd7572ac104230fe6 Mon Sep 17 00:00:00 2001 From: mrapple Date: Thu, 31 Jul 2014 20:05:06 -0500 Subject: [PATCH] Fix missed diff from Minecraft 1.3.1 update diff --git a/CraftBukkit-Patches/0170-Fix-LEFT_CLICK_AIR-detection-when-not-in-creative.patch b/CraftBukkit-Patches/0168-Fix-LEFT_CLICK_AIR-detection-when-not-in-creative.patch similarity index 91% rename from CraftBukkit-Patches/0170-Fix-LEFT_CLICK_AIR-detection-when-not-in-creative.patch rename to CraftBukkit-Patches/0168-Fix-LEFT_CLICK_AIR-detection-when-not-in-creative.patch index 7b96439178..e47b9678f4 100644 --- a/CraftBukkit-Patches/0170-Fix-LEFT_CLICK_AIR-detection-when-not-in-creative.patch +++ b/CraftBukkit-Patches/0168-Fix-LEFT_CLICK_AIR-detection-when-not-in-creative.patch @@ -1,11 +1,11 @@ -From a351c5f393f924a68d20575d7a57815f3ba959c7 Mon Sep 17 00:00:00 2001 +From c001de40e026f60551f7bac0e179029a99457df3 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Thu, 7 Aug 2014 15:48:33 +0100 Subject: [PATCH] Fix LEFT_CLICK_AIR detection when not in creative diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 97037ff..0e2bc03 100644 +index 2b764b5..188393c 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1044,7 +1044,7 @@ public class PlayerConnection implements PacketPlayInListener { diff --git a/CraftBukkit-Patches/0171-Plug-WorldMap-Memory-Leak.patch b/CraftBukkit-Patches/0169-Plug-WorldMap-Memory-Leak.patch similarity index 97% rename from CraftBukkit-Patches/0171-Plug-WorldMap-Memory-Leak.patch rename to CraftBukkit-Patches/0169-Plug-WorldMap-Memory-Leak.patch index b26d79e67e..fbb962f928 100644 --- a/CraftBukkit-Patches/0171-Plug-WorldMap-Memory-Leak.patch +++ b/CraftBukkit-Patches/0169-Plug-WorldMap-Memory-Leak.patch @@ -1,4 +1,4 @@ -From 7ca7779b28c1c0c64547972c419251ab682804d9 Mon Sep 17 00:00:00 2001 +From 4bc8530bcd9f6864a0c13ef77022e63b12f9409c 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 diff --git a/CraftBukkit-Patches/0172-Force-Close-Inventory-On-Move.patch b/CraftBukkit-Patches/0170-Force-Close-Inventory-On-Move.patch similarity index 94% rename from CraftBukkit-Patches/0172-Force-Close-Inventory-On-Move.patch rename to CraftBukkit-Patches/0170-Force-Close-Inventory-On-Move.patch index d29fa2b48d..1cfa9075fb 100644 --- a/CraftBukkit-Patches/0172-Force-Close-Inventory-On-Move.patch +++ b/CraftBukkit-Patches/0170-Force-Close-Inventory-On-Move.patch @@ -1,11 +1,11 @@ -From cbfc57150639ba9254c567c4391904aa5ba6967b Mon Sep 17 00:00:00 2001 +From 8b5cf125f23b9f8d8910283e4f6dd484442aaec1 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 10 Aug 2014 11:01:02 +1000 Subject: [PATCH] Force Close Inventory On Move diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 0e2bc03..e8bfc41 100644 +index 188393c..5aea702 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -489,6 +489,12 @@ public class PlayerConnection implements PacketPlayInListener { diff --git a/CraftBukkit-Patches/0173-Fix-Corrupted-Trapped-Chest.patch b/CraftBukkit-Patches/0171-Fix-Corrupted-Trapped-Chest.patch similarity index 94% rename from CraftBukkit-Patches/0173-Fix-Corrupted-Trapped-Chest.patch rename to CraftBukkit-Patches/0171-Fix-Corrupted-Trapped-Chest.patch index d96ce79559..e69763e28b 100644 --- a/CraftBukkit-Patches/0173-Fix-Corrupted-Trapped-Chest.patch +++ b/CraftBukkit-Patches/0171-Fix-Corrupted-Trapped-Chest.patch @@ -1,4 +1,4 @@ -From d3ad925d2b1ffcdab030cf892d231596d8493558 Mon Sep 17 00:00:00 2001 +From 8cc0ac9b426998dcb6684d0dc0bbb1c5193dc428 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/0174-Remove-uneeded-validation.patch b/CraftBukkit-Patches/0172-Remove-uneeded-validation.patch similarity index 95% rename from CraftBukkit-Patches/0174-Remove-uneeded-validation.patch rename to CraftBukkit-Patches/0172-Remove-uneeded-validation.patch index 204fa47ab9..c3e2d70f29 100644 --- a/CraftBukkit-Patches/0174-Remove-uneeded-validation.patch +++ b/CraftBukkit-Patches/0172-Remove-uneeded-validation.patch @@ -1,4 +1,4 @@ -From b977d6e326ccdabb10e3d7af880b08f91be60911 Mon Sep 17 00:00:00 2001 +From e7e76aa6d06aabea125cc9a9fb0664f4f0020765 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/0175-Add-Hunger-Config-Values.patch b/CraftBukkit-Patches/0173-Add-Hunger-Config-Values.patch similarity index 98% rename from CraftBukkit-Patches/0175-Add-Hunger-Config-Values.patch rename to CraftBukkit-Patches/0173-Add-Hunger-Config-Values.patch index 424cd3d5c3..a9c887b767 100644 --- a/CraftBukkit-Patches/0175-Add-Hunger-Config-Values.patch +++ b/CraftBukkit-Patches/0173-Add-Hunger-Config-Values.patch @@ -1,4 +1,4 @@ -From 8a5b07ff394ea730f43b69c19c4500f542f505f4 Mon Sep 17 00:00:00 2001 +From 928c29946c3fcbf3f4433f6c3f3f92ea60433cf1 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/0176-Make-debug-logging-togglable.patch b/CraftBukkit-Patches/0174-Make-debug-logging-togglable.patch similarity index 97% rename from CraftBukkit-Patches/0176-Make-debug-logging-togglable.patch rename to CraftBukkit-Patches/0174-Make-debug-logging-togglable.patch index d58a20fb3a..14f31691a1 100644 --- a/CraftBukkit-Patches/0176-Make-debug-logging-togglable.patch +++ b/CraftBukkit-Patches/0174-Make-debug-logging-togglable.patch @@ -1,4 +1,4 @@ -From eb3b3f16aa7769e44c2394e78f650a860fcb364f Mon Sep 17 00:00:00 2001 +From c71d321e676a2c349ad719f7f09e391813a40ce6 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/Spigot-Server-Patches/0005-Teleport-passenger-vehicle-with-player.patch b/Spigot-Server-Patches/0005-Teleport-passenger-vehicle-with-player.patch index e9a80e7963..fb9c667710 100644 --- a/Spigot-Server-Patches/0005-Teleport-passenger-vehicle-with-player.patch +++ b/Spigot-Server-Patches/0005-Teleport-passenger-vehicle-with-player.patch @@ -1,4 +1,4 @@ -From 67c533b734ea9fbc764bc0ad817ce87970db47e2 Mon Sep 17 00:00:00 2001 +From 18e6a6b6a2d1234d946d8ffaa2e7b00b8d40b551 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 17 May 2014 02:12:39 -0500 Subject: [PATCH] Teleport passenger/vehicle with player @@ -43,22 +43,12 @@ index dea5e19..5dc7e95 100644 if (j == 1 && i == 1) { ChunkCoordinates chunkcoordinates = worldserver1.getSpawn(); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 1127461..849b971 100644 +index e7569c6..770f1d1 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -477,12 +477,33 @@ public class CraftPlayer extends CraftHumanEntity implements Player { - if (event.isCancelled()) { - return false; - } -- -+ -+ // PaperSpigot start - // Spigot Start -- eject(); -- leaveVehicle(); -+ //eject(); -+ //leaveVehicle(); - // Spigot End +@@ -479,6 +479,26 @@ public class CraftPlayer extends CraftHumanEntity implements Player { + // If this player is riding another entity, we must dismount before teleporting. + entity.mount(null); + // PaperSpigot start + Entity vehicle = entity.vehicle; @@ -83,7 +73,7 @@ index 1127461..849b971 100644 // Update the From Location from = event.getFrom(); // Grab the new To Location dependent on whether the event was cancelled. -@@ -502,6 +523,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -498,6 +518,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player { } else { server.getHandle().moveToWorld(entity, toWorld.dimension, true, to, true); } diff --git a/Spigot-Server-Patches/0030-Player-affects-spawning-API.patch b/Spigot-Server-Patches/0030-Player-affects-spawning-API.patch index c5dde5255c..e90469e9d8 100644 --- a/Spigot-Server-Patches/0030-Player-affects-spawning-API.patch +++ b/Spigot-Server-Patches/0030-Player-affects-spawning-API.patch @@ -1,4 +1,4 @@ -From 10bf5e90254667d8ead33152b4ae4842d31d88fc Mon Sep 17 00:00:00 2001 +From 328d91df5c7c81402790341523d4a4dbe17e46e9 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Fri, 8 Aug 2014 22:51:26 -0500 Subject: [PATCH] Player affects spawning API @@ -106,10 +106,10 @@ index 717be3b..33c228b 100644 for (int i = 0; i < this.players.size(); ++i) { EntityHuman entityhuman = (EntityHuman) this.players.get(i); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 849b971..ddda795 100644 +index 770f1d1..542508c 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1425,6 +1425,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1420,6 +1420,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player { return java.util.Collections.unmodifiableSet( ret ); }