diff --git a/CraftBukkit b/CraftBukkit index 89974e188c..68d0e5756b 160000 --- a/CraftBukkit +++ b/CraftBukkit @@ -1 +1 @@ -Subproject commit 89974e188c4c5c7758a4e76689f52a9f96f6c01e +Subproject commit 68d0e5756b60bd53828fae1d6e3fb7335b1fded1 diff --git a/CraftBukkit-Patches/0065-Fix-doors-being-opened-by-redstone.patch b/CraftBukkit-Patches/0065-Fix-doors-being-opened-by-redstone.patch deleted file mode 100644 index 3b4c5c20d3..0000000000 --- a/CraftBukkit-Patches/0065-Fix-doors-being-opened-by-redstone.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 1e8b6aecceebd6d0fb2e9da09df4ce587b63d0c2 Mon Sep 17 00:00:00 2001 -From: md_5 -Date: Sun, 1 Dec 2013 17:28:40 +1100 -Subject: [PATCH] Fix doors being opened by redstone. - - -diff --git a/src/main/java/net/minecraft/server/BlockDoor.java b/src/main/java/net/minecraft/server/BlockDoor.java -index 046ffb8..d9be84c 100644 ---- a/src/main/java/net/minecraft/server/BlockDoor.java -+++ b/src/main/java/net/minecraft/server/BlockDoor.java -@@ -166,8 +166,8 @@ public class BlockDoor extends Block { - if (!world.isStatic) { - this.b(world, i, j, k, l, 0); - } -- // CraftBukkit start -- } else if (l > 0 && Block.e(l).isPowerSource()) { -+ } else { -+ // CraftBukkit start - org.bukkit.World bworld = world.getWorld(); - org.bukkit.block.Block bukkitBlock = bworld.getBlockAt(i, j, k); - org.bukkit.block.Block blockTop = bworld.getBlockAt(i, j + 1, k); --- -1.8.3.2 - diff --git a/CraftBukkit-Patches/0066-Fix-packed-ice-generation.patch b/CraftBukkit-Patches/0065-Fix-packed-ice-generation.patch similarity index 97% rename from CraftBukkit-Patches/0066-Fix-packed-ice-generation.patch rename to CraftBukkit-Patches/0065-Fix-packed-ice-generation.patch index 800dbdd45e..d28a039d95 100644 --- a/CraftBukkit-Patches/0066-Fix-packed-ice-generation.patch +++ b/CraftBukkit-Patches/0065-Fix-packed-ice-generation.patch @@ -1,4 +1,4 @@ -From 7bcbb026d61d67c62ba9ee454cca3f4c189fa50a Mon Sep 17 00:00:00 2001 +From d099c5cf0c68401eacfaeb1f8064d2faf1fd1411 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 1 Dec 2013 17:52:14 +1100 Subject: [PATCH] Fix packed ice generation diff --git a/CraftBukkit-Patches/0067-BungeeCord-Support.patch b/CraftBukkit-Patches/0066-BungeeCord-Support.patch similarity index 97% rename from CraftBukkit-Patches/0067-BungeeCord-Support.patch rename to CraftBukkit-Patches/0066-BungeeCord-Support.patch index c3ee607b41..aa43594f28 100644 --- a/CraftBukkit-Patches/0067-BungeeCord-Support.patch +++ b/CraftBukkit-Patches/0066-BungeeCord-Support.patch @@ -1,4 +1,4 @@ -From 32cc26548db81d35dc38ea50987ac5d76a9a6ef0 Mon Sep 17 00:00:00 2001 +From 036fc7ed7cf49e6ce45b6d776fe382de2dcb5d7b Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 1 Dec 2013 18:18:41 +1100 Subject: [PATCH] BungeeCord Support diff --git a/CraftBukkit-Patches/0068-Fix-links-in-chat.patch b/CraftBukkit-Patches/0067-Fix-links-in-chat.patch similarity index 97% rename from CraftBukkit-Patches/0068-Fix-links-in-chat.patch rename to CraftBukkit-Patches/0067-Fix-links-in-chat.patch index ef3433742b..992bd0e4cc 100644 --- a/CraftBukkit-Patches/0068-Fix-links-in-chat.patch +++ b/CraftBukkit-Patches/0067-Fix-links-in-chat.patch @@ -1,4 +1,4 @@ -From 8cb1e75734ea07360b11efb0734785c8300df9cf Mon Sep 17 00:00:00 2001 +From 92c15b1f9c59b5c5898fead8e68c604eeeb800d9 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Sun, 1 Dec 2013 10:33:55 +0000 Subject: [PATCH] Fix links in chat @@ -73,5 +73,5 @@ index cc8e715..377653b 100644 } } -- -1.8.4.msysgit.0 +1.8.3.2 diff --git a/CraftBukkit-Patches/0069-Fix-experience-drops.patch b/CraftBukkit-Patches/0068-Fix-experience-drops.patch similarity index 92% rename from CraftBukkit-Patches/0069-Fix-experience-drops.patch rename to CraftBukkit-Patches/0068-Fix-experience-drops.patch index 16d6e5ba78..488dd7a3bd 100644 --- a/CraftBukkit-Patches/0069-Fix-experience-drops.patch +++ b/CraftBukkit-Patches/0068-Fix-experience-drops.patch @@ -1,4 +1,4 @@ -From 4e5d4ed4a83ebd8f4d9160b048ed626dadeeaf7b Mon Sep 17 00:00:00 2001 +From 7b66998011a3a50f29342d263f72653bbff269bf Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 2 Dec 2013 14:54:00 +1100 Subject: [PATCH] Fix experience drops diff --git a/CraftBukkit-Patches/0070-Fix-some-recipe-book-bugs.patch b/CraftBukkit-Patches/0069-Fix-some-recipe-book-bugs.patch similarity index 98% rename from CraftBukkit-Patches/0070-Fix-some-recipe-book-bugs.patch rename to CraftBukkit-Patches/0069-Fix-some-recipe-book-bugs.patch index 63eba94d98..ff83c2b360 100644 --- a/CraftBukkit-Patches/0070-Fix-some-recipe-book-bugs.patch +++ b/CraftBukkit-Patches/0069-Fix-some-recipe-book-bugs.patch @@ -1,4 +1,4 @@ -From d764f77e317568fcf35a17d8b90135635b98e874 Mon Sep 17 00:00:00 2001 +From 1bf86fb2eea33af84ad747deb174a2b3a14e0305 Mon Sep 17 00:00:00 2001 From: toastedtruth Date: Sun, 1 Dec 2013 23:18:16 +0000 Subject: [PATCH] Fix some recipe book bugs