From c7c08d81ae36472dfb5c3ee81236bbe3be5348a3 Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 11 Jul 2013 11:33:09 +1000 Subject: [PATCH] Remove CraftHorse patch since it is now covered by upstream --- ...-CraftHorse-Instance-for-EntityHorse.patch | 23 ------------------- ...erly-Consume-Bonemeal-in-Dispensers.patch} | 2 +- ...ent-Ghost-Players-Caused-by-Plugins.patch} | 2 +- ...e-Ambient-Setting-of-Potion-Effects.patch} | 2 +- ... => 0063-Console-Command-Completion.patch} | 2 +- ...64-Fix-StructureGrowEvent.getPlayer.patch} | 2 +- ...65-Client-Crash-Cannot-Send-Message.patch} | 2 +- 7 files changed, 6 insertions(+), 29 deletions(-) delete mode 100644 CraftBukkit-Patches/0060-Create-CraftHorse-Instance-for-EntityHorse.patch rename CraftBukkit-Patches/{0061-Properly-Consume-Bonemeal-in-Dispensers.patch => 0060-Properly-Consume-Bonemeal-in-Dispensers.patch} (97%) rename CraftBukkit-Patches/{0062-Prevent-Ghost-Players-Caused-by-Plugins.patch => 0061-Prevent-Ghost-Players-Caused-by-Plugins.patch} (94%) rename CraftBukkit-Patches/{0063-Define-Ambient-Setting-of-Potion-Effects.patch => 0062-Define-Ambient-Setting-of-Potion-Effects.patch} (96%) rename CraftBukkit-Patches/{0064-Console-Command-Completion.patch => 0063-Console-Command-Completion.patch} (98%) rename CraftBukkit-Patches/{0065-Fix-StructureGrowEvent.getPlayer.patch => 0064-Fix-StructureGrowEvent.getPlayer.patch} (93%) rename CraftBukkit-Patches/{0066-Client-Crash-Cannot-Send-Message.patch => 0065-Client-Crash-Cannot-Send-Message.patch} (93%) diff --git a/CraftBukkit-Patches/0060-Create-CraftHorse-Instance-for-EntityHorse.patch b/CraftBukkit-Patches/0060-Create-CraftHorse-Instance-for-EntityHorse.patch deleted file mode 100644 index ac14cb9d3..000000000 --- a/CraftBukkit-Patches/0060-Create-CraftHorse-Instance-for-EntityHorse.patch +++ /dev/null @@ -1,23 +0,0 @@ -From d54719af52c66e89509b9ee01cfe700bc05be5be Mon Sep 17 00:00:00 2001 -From: Mike Primm -Date: Thu, 4 Jul 2013 00:03:42 -0500 -Subject: [PATCH] Create CraftHorse Instance for EntityHorse - -Handle creating instance of CraftHorse for EntityHorse instances and spawn() - -diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index a68169f..7c0a026 100644 ---- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -893,6 +893,8 @@ public class CraftWorld implements World { - entity = new EntityCreeper(world); - } else if (Ghast.class.isAssignableFrom(clazz)) { - entity = new EntityGhast(world); -+ } else if (Horse.class.isAssignableFrom(clazz)) { -+ entity = new EntityHorse(world); - } else if (Pig.class.isAssignableFrom(clazz)) { - entity = new EntityPig(world); - } else if (Player.class.isAssignableFrom(clazz)) { --- -1.8.1.2 - diff --git a/CraftBukkit-Patches/0061-Properly-Consume-Bonemeal-in-Dispensers.patch b/CraftBukkit-Patches/0060-Properly-Consume-Bonemeal-in-Dispensers.patch similarity index 97% rename from CraftBukkit-Patches/0061-Properly-Consume-Bonemeal-in-Dispensers.patch rename to CraftBukkit-Patches/0060-Properly-Consume-Bonemeal-in-Dispensers.patch index 0553bc679..3534eb189 100644 --- a/CraftBukkit-Patches/0061-Properly-Consume-Bonemeal-in-Dispensers.patch +++ b/CraftBukkit-Patches/0060-Properly-Consume-Bonemeal-in-Dispensers.patch @@ -1,4 +1,4 @@ -From 28fd5fba0a7b1771bce44f361ab709022eba91b7 Mon Sep 17 00:00:00 2001 +From 3e68f19219ef911b0c48d121fabe3bf34f4d8a02 Mon Sep 17 00:00:00 2001 From: Alex Ciuba Date: Mon, 10 Jun 2013 16:04:38 -0400 Subject: [PATCH] Properly Consume Bonemeal in Dispensers diff --git a/CraftBukkit-Patches/0062-Prevent-Ghost-Players-Caused-by-Plugins.patch b/CraftBukkit-Patches/0061-Prevent-Ghost-Players-Caused-by-Plugins.patch similarity index 94% rename from CraftBukkit-Patches/0062-Prevent-Ghost-Players-Caused-by-Plugins.patch rename to CraftBukkit-Patches/0061-Prevent-Ghost-Players-Caused-by-Plugins.patch index 0d4a93708..bb2a83178 100644 --- a/CraftBukkit-Patches/0062-Prevent-Ghost-Players-Caused-by-Plugins.patch +++ b/CraftBukkit-Patches/0061-Prevent-Ghost-Players-Caused-by-Plugins.patch @@ -1,4 +1,4 @@ -From af0e59ae5d8a85658b4309c1b3a7fd8e62b28165 Mon Sep 17 00:00:00 2001 +From 20c689599b300747b7b102d0ef48e917b3e6ffdb Mon Sep 17 00:00:00 2001 From: Alex Ciuba Date: Tue, 11 Jun 2013 15:23:03 -0400 Subject: [PATCH] Prevent Ghost Players Caused by Plugins diff --git a/CraftBukkit-Patches/0063-Define-Ambient-Setting-of-Potion-Effects.patch b/CraftBukkit-Patches/0062-Define-Ambient-Setting-of-Potion-Effects.patch similarity index 96% rename from CraftBukkit-Patches/0063-Define-Ambient-Setting-of-Potion-Effects.patch rename to CraftBukkit-Patches/0062-Define-Ambient-Setting-of-Potion-Effects.patch index 40cde95fb..22288c75a 100644 --- a/CraftBukkit-Patches/0063-Define-Ambient-Setting-of-Potion-Effects.patch +++ b/CraftBukkit-Patches/0062-Define-Ambient-Setting-of-Potion-Effects.patch @@ -1,4 +1,4 @@ -From 4cf48c39d3d68b3e7c64809909d03a3e1acea22b Mon Sep 17 00:00:00 2001 +From af786a920ab177e4f00249244163327ccf02a660 Mon Sep 17 00:00:00 2001 From: Jim Bilbrey Date: Wed, 19 Jun 2013 05:38:05 -0400 Subject: [PATCH] Define Ambient Setting of Potion Effects diff --git a/CraftBukkit-Patches/0064-Console-Command-Completion.patch b/CraftBukkit-Patches/0063-Console-Command-Completion.patch similarity index 98% rename from CraftBukkit-Patches/0064-Console-Command-Completion.patch rename to CraftBukkit-Patches/0063-Console-Command-Completion.patch index c56331cac..758373b88 100644 --- a/CraftBukkit-Patches/0064-Console-Command-Completion.patch +++ b/CraftBukkit-Patches/0063-Console-Command-Completion.patch @@ -1,4 +1,4 @@ -From 71591c3b90d7988577409e3beda026973c18ded0 Mon Sep 17 00:00:00 2001 +From c88c2a44162732adaeb8ccf4c7b355f2585965dd Mon Sep 17 00:00:00 2001 From: Phillip Schichtel Date: Fri, 5 Jul 2013 21:55:00 +1000 Subject: [PATCH] Console Command Completion diff --git a/CraftBukkit-Patches/0065-Fix-StructureGrowEvent.getPlayer.patch b/CraftBukkit-Patches/0064-Fix-StructureGrowEvent.getPlayer.patch similarity index 93% rename from CraftBukkit-Patches/0065-Fix-StructureGrowEvent.getPlayer.patch rename to CraftBukkit-Patches/0064-Fix-StructureGrowEvent.getPlayer.patch index 6cd642ee2..5dacb8d03 100644 --- a/CraftBukkit-Patches/0065-Fix-StructureGrowEvent.getPlayer.patch +++ b/CraftBukkit-Patches/0064-Fix-StructureGrowEvent.getPlayer.patch @@ -1,4 +1,4 @@ -From d5e673509003b9580269ce356f1f62a8f2cde4b3 Mon Sep 17 00:00:00 2001 +From f6d9dd6ce30df450863c96dc96c4e529bd9107ea Mon Sep 17 00:00:00 2001 From: ItsHarry Date: Wed, 10 Jul 2013 13:45:08 +0200 Subject: [PATCH] Fix StructureGrowEvent.getPlayer() diff --git a/CraftBukkit-Patches/0066-Client-Crash-Cannot-Send-Message.patch b/CraftBukkit-Patches/0065-Client-Crash-Cannot-Send-Message.patch similarity index 93% rename from CraftBukkit-Patches/0066-Client-Crash-Cannot-Send-Message.patch rename to CraftBukkit-Patches/0065-Client-Crash-Cannot-Send-Message.patch index 3c9169309..81827d013 100644 --- a/CraftBukkit-Patches/0066-Client-Crash-Cannot-Send-Message.patch +++ b/CraftBukkit-Patches/0065-Client-Crash-Cannot-Send-Message.patch @@ -1,4 +1,4 @@ -From 1cb88b278d03153c18df3801bff262d80e91642b Mon Sep 17 00:00:00 2001 +From ab716ebdb094de8cdd3966c4cad572a130614258 Mon Sep 17 00:00:00 2001 From: md_5 Date: Wed, 10 Jul 2013 23:46:09 +1000 Subject: [PATCH] Client Crash Cannot Send Message