From 2314af8cb07996b04327d7f06f047e6bb9dcd426 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 24 Mar 2013 10:59:27 +1100 Subject: [PATCH] Remove upstream pulled patch. --- ...-missing-HangingBreakEvent-when-Ent.patch} | 2 +- ...-slot-independent-of-inventory-type-.patch | 26 ------------------- ...3667-Faux-sleepers-wake-up-normally.patch} | 2 +- ...rong-block-in-BlockDispenseEvent-wh.patch} | 2 +- ...patch => 0035-PlayerItemDamageEvent.patch} | 2 +- ...ch => 0036-Faster-UUID-for-entities.patch} | 4 +-- ...ch => 0037-Prevent-NPE-in-CraftSign.patch} | 2 +- ...8-Stage-DataWatcher-WatchableObject.patch} | 2 +- ...atch => 0039-Entity-Tracking-Ranges.patch} | 2 +- ...rt.patch => 0040-BungeeCord-Support.patch} | 4 +-- ...ch => 0041-Texture-Pack-Resolutions.patch} | 6 ++--- ...h => 0042-Entity-Tracking-Intervals.patch} | 2 +- ... => 0043-Limit-Custom-Map-Rendering.patch} | 2 +- 13 files changed, 16 insertions(+), 42 deletions(-) rename CraftBukkit-Patches/{0033-BUKKIT-3661-fixed-missing-HangingBreakEvent-when-Ent.patch => 0032-BUKKIT-3661-fixed-missing-HangingBreakEvent-when-Ent.patch} (96%) delete mode 100644 CraftBukkit-Patches/0032-Identify-outside-slot-independent-of-inventory-type-.patch rename CraftBukkit-Patches/{0034-Adds-BUKKIT-3667-Faux-sleepers-wake-up-normally.patch => 0033-Adds-BUKKIT-3667-Faux-sleepers-wake-up-normally.patch} (94%) rename CraftBukkit-Patches/{0035-BUKKIT-3668-Fix-wrong-block-in-BlockDispenseEvent-wh.patch => 0034-BUKKIT-3668-Fix-wrong-block-in-BlockDispenseEvent-wh.patch} (94%) rename CraftBukkit-Patches/{0036-PlayerItemDamageEvent.patch => 0035-PlayerItemDamageEvent.patch} (97%) rename CraftBukkit-Patches/{0037-Faster-UUID-for-entities.patch => 0036-Faster-UUID-for-entities.patch} (91%) rename CraftBukkit-Patches/{0038-Prevent-NPE-in-CraftSign.patch => 0037-Prevent-NPE-in-CraftSign.patch} (96%) rename CraftBukkit-Patches/{0039-Stage-DataWatcher-WatchableObject.patch => 0038-Stage-DataWatcher-WatchableObject.patch} (99%) rename CraftBukkit-Patches/{0040-Entity-Tracking-Ranges.patch => 0039-Entity-Tracking-Ranges.patch} (99%) rename CraftBukkit-Patches/{0041-BungeeCord-Support.patch => 0040-BungeeCord-Support.patch} (96%) rename CraftBukkit-Patches/{0042-Texture-Pack-Resolutions.patch => 0041-Texture-Pack-Resolutions.patch} (96%) rename CraftBukkit-Patches/{0043-Entity-Tracking-Intervals.patch => 0042-Entity-Tracking-Intervals.patch} (94%) rename CraftBukkit-Patches/{0044-Limit-Custom-Map-Rendering.patch => 0043-Limit-Custom-Map-Rendering.patch} (98%) diff --git a/CraftBukkit-Patches/0033-BUKKIT-3661-fixed-missing-HangingBreakEvent-when-Ent.patch b/CraftBukkit-Patches/0032-BUKKIT-3661-fixed-missing-HangingBreakEvent-when-Ent.patch similarity index 96% rename from CraftBukkit-Patches/0033-BUKKIT-3661-fixed-missing-HangingBreakEvent-when-Ent.patch rename to CraftBukkit-Patches/0032-BUKKIT-3661-fixed-missing-HangingBreakEvent-when-Ent.patch index 6b575dfc50..57467ab658 100644 --- a/CraftBukkit-Patches/0033-BUKKIT-3661-fixed-missing-HangingBreakEvent-when-Ent.patch +++ b/CraftBukkit-Patches/0032-BUKKIT-3661-fixed-missing-HangingBreakEvent-when-Ent.patch @@ -1,4 +1,4 @@ -From 8ddc8e32fae996aaff284a7bbe59e1c0d9f084ea Mon Sep 17 00:00:00 2001 +From c9da444994984d83c474cc78ab7bfdbe043d7c32 Mon Sep 17 00:00:00 2001 From: Yariv Livay Date: Sat, 2 Mar 2013 09:36:52 +1100 Subject: [PATCH] BUKKIT-3661, fixed missing HangingBreakEvent when diff --git a/CraftBukkit-Patches/0032-Identify-outside-slot-independent-of-inventory-type-.patch b/CraftBukkit-Patches/0032-Identify-outside-slot-independent-of-inventory-type-.patch deleted file mode 100644 index 4e4c49a7c0..0000000000 --- a/CraftBukkit-Patches/0032-Identify-outside-slot-independent-of-inventory-type-.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 0caa529847ec93e28db06b1efc44bcd95024cae5 Mon Sep 17 00:00:00 2001 -From: EdGruberman -Date: Thu, 21 Feb 2013 14:22:09 -0700 -Subject: [PATCH] Identify outside slot independent of inventory type; Fixes - BUKKIT-2768 - ---- - src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryView.java | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryView.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryView.java -index 6ffc73d..1c7934d 100644 ---- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryView.java -+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryView.java -@@ -75,7 +75,7 @@ public class CraftInventoryView extends InventoryView { - - public static SlotType getSlotType(InventoryView inventory, int slot) { - SlotType type = SlotType.CONTAINER; -- if (slot < inventory.getTopInventory().getSize()) { -+ if (slot >= 0 && slot < inventory.getTopInventory().getSize()) { - switch(inventory.getType()) { - case FURNACE: - if (slot == 2) { --- -1.8.1-rc2 - diff --git a/CraftBukkit-Patches/0034-Adds-BUKKIT-3667-Faux-sleepers-wake-up-normally.patch b/CraftBukkit-Patches/0033-Adds-BUKKIT-3667-Faux-sleepers-wake-up-normally.patch similarity index 94% rename from CraftBukkit-Patches/0034-Adds-BUKKIT-3667-Faux-sleepers-wake-up-normally.patch rename to CraftBukkit-Patches/0033-Adds-BUKKIT-3667-Faux-sleepers-wake-up-normally.patch index 812d31e379..270645ba66 100644 --- a/CraftBukkit-Patches/0034-Adds-BUKKIT-3667-Faux-sleepers-wake-up-normally.patch +++ b/CraftBukkit-Patches/0033-Adds-BUKKIT-3667-Faux-sleepers-wake-up-normally.patch @@ -1,4 +1,4 @@ -From adb39549b75e5e5e851484e05b4a8371a41ff517 Mon Sep 17 00:00:00 2001 +From ae8970c74947203e8cabaa71b44ef06b8fce2d16 Mon Sep 17 00:00:00 2001 From: Yariv Livay Date: Mon, 25 Feb 2013 22:26:36 +0200 Subject: [PATCH] Adds BUKKIT-3667, Faux sleepers wake up normally diff --git a/CraftBukkit-Patches/0035-BUKKIT-3668-Fix-wrong-block-in-BlockDispenseEvent-wh.patch b/CraftBukkit-Patches/0034-BUKKIT-3668-Fix-wrong-block-in-BlockDispenseEvent-wh.patch similarity index 94% rename from CraftBukkit-Patches/0035-BUKKIT-3668-Fix-wrong-block-in-BlockDispenseEvent-wh.patch rename to CraftBukkit-Patches/0034-BUKKIT-3668-Fix-wrong-block-in-BlockDispenseEvent-wh.patch index ed4abad6d6..89a38c4e18 100644 --- a/CraftBukkit-Patches/0035-BUKKIT-3668-Fix-wrong-block-in-BlockDispenseEvent-wh.patch +++ b/CraftBukkit-Patches/0034-BUKKIT-3668-Fix-wrong-block-in-BlockDispenseEvent-wh.patch @@ -1,4 +1,4 @@ -From 3e18c3f7430deb2f1d2961374c513fe7b1387ff9 Mon Sep 17 00:00:00 2001 +From 1d944d45bd7b34fa8e4898a52e3faa4ec352ac8a Mon Sep 17 00:00:00 2001 From: Yariv Livay Date: Tue, 26 Feb 2013 20:14:34 +0200 Subject: [PATCH] BUKKIT-3668 Fix wrong block in BlockDispenseEvent when diff --git a/CraftBukkit-Patches/0036-PlayerItemDamageEvent.patch b/CraftBukkit-Patches/0035-PlayerItemDamageEvent.patch similarity index 97% rename from CraftBukkit-Patches/0036-PlayerItemDamageEvent.patch rename to CraftBukkit-Patches/0035-PlayerItemDamageEvent.patch index 9a2e5d9e38..cbf6c9fd02 100644 --- a/CraftBukkit-Patches/0036-PlayerItemDamageEvent.patch +++ b/CraftBukkit-Patches/0035-PlayerItemDamageEvent.patch @@ -1,4 +1,4 @@ -From c5c3bff96107ce30892a868fee8e1a01ece0a09a Mon Sep 17 00:00:00 2001 +From d41afe438e9c798c4f7a71b4aee044fc1c4b22ee Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 4 Mar 2013 18:45:52 +1100 Subject: [PATCH] PlayerItemDamageEvent diff --git a/CraftBukkit-Patches/0037-Faster-UUID-for-entities.patch b/CraftBukkit-Patches/0036-Faster-UUID-for-entities.patch similarity index 91% rename from CraftBukkit-Patches/0037-Faster-UUID-for-entities.patch rename to CraftBukkit-Patches/0036-Faster-UUID-for-entities.patch index 3338d47bf5..d66213ad5f 100644 --- a/CraftBukkit-Patches/0037-Faster-UUID-for-entities.patch +++ b/CraftBukkit-Patches/0036-Faster-UUID-for-entities.patch @@ -1,4 +1,4 @@ -From 4314282ffb1d18eb45aa8a748a38b1c8fe41888c Mon Sep 17 00:00:00 2001 +From 7139041a01222ac05965b666a600f65ddb8d9598 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 17 Mar 2013 19:02:50 +1100 Subject: [PATCH] Faster UUID for entities @@ -9,7 +9,7 @@ It is overkill to create a new SecureRandom on each entity create and then use i 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 24ab35f..c4c2595 100644 +index 0538e20..150f5f8 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -154,7 +154,7 @@ public abstract class Entity { diff --git a/CraftBukkit-Patches/0038-Prevent-NPE-in-CraftSign.patch b/CraftBukkit-Patches/0037-Prevent-NPE-in-CraftSign.patch similarity index 96% rename from CraftBukkit-Patches/0038-Prevent-NPE-in-CraftSign.patch rename to CraftBukkit-Patches/0037-Prevent-NPE-in-CraftSign.patch index 67e2047900..b1616c84fb 100644 --- a/CraftBukkit-Patches/0038-Prevent-NPE-in-CraftSign.patch +++ b/CraftBukkit-Patches/0037-Prevent-NPE-in-CraftSign.patch @@ -1,4 +1,4 @@ -From d83fbc063ceb0c035c5a1007c9990f559b5641d6 Mon Sep 17 00:00:00 2001 +From c175ccfef07273eda13c576a9a7f79e5eb945b01 Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 18 Mar 2013 20:01:44 +1100 Subject: [PATCH] Prevent NPE in CraftSign diff --git a/CraftBukkit-Patches/0039-Stage-DataWatcher-WatchableObject.patch b/CraftBukkit-Patches/0038-Stage-DataWatcher-WatchableObject.patch similarity index 99% rename from CraftBukkit-Patches/0039-Stage-DataWatcher-WatchableObject.patch rename to CraftBukkit-Patches/0038-Stage-DataWatcher-WatchableObject.patch index 5a2cfeeaa2..74f2bf34a6 100644 --- a/CraftBukkit-Patches/0039-Stage-DataWatcher-WatchableObject.patch +++ b/CraftBukkit-Patches/0038-Stage-DataWatcher-WatchableObject.patch @@ -1,4 +1,4 @@ -From 0e2aa35b6d74724a41072b50777fc92d716c64c7 Mon Sep 17 00:00:00 2001 +From 940d1800403acd4b01d5d674d67ebf0bd6797906 Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 21 Mar 2013 17:00:54 +1100 Subject: [PATCH] Stage DataWatcher & WatchableObject. diff --git a/CraftBukkit-Patches/0040-Entity-Tracking-Ranges.patch b/CraftBukkit-Patches/0039-Entity-Tracking-Ranges.patch similarity index 99% rename from CraftBukkit-Patches/0040-Entity-Tracking-Ranges.patch rename to CraftBukkit-Patches/0039-Entity-Tracking-Ranges.patch index 986c584296..169d5efd96 100644 --- a/CraftBukkit-Patches/0040-Entity-Tracking-Ranges.patch +++ b/CraftBukkit-Patches/0039-Entity-Tracking-Ranges.patch @@ -1,4 +1,4 @@ -From 8f6d008a011275cf5205437a6f7a02680286a6e5 Mon Sep 17 00:00:00 2001 +From 1f4574435a3791f1b922ff6b6a79b13a25795353 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 20 Feb 2013 11:58:47 -0500 Subject: [PATCH] Entity Tracking Ranges diff --git a/CraftBukkit-Patches/0041-BungeeCord-Support.patch b/CraftBukkit-Patches/0040-BungeeCord-Support.patch similarity index 96% rename from CraftBukkit-Patches/0041-BungeeCord-Support.patch rename to CraftBukkit-Patches/0040-BungeeCord-Support.patch index 78b4af766c..340f7b8b49 100644 --- a/CraftBukkit-Patches/0041-BungeeCord-Support.patch +++ b/CraftBukkit-Patches/0040-BungeeCord-Support.patch @@ -1,4 +1,4 @@ -From f081be9a6ac0b77c3776bfb3c058a65db932e80f Mon Sep 17 00:00:00 2001 +From 80ee5d4d880cbcf81dd8c988cce5ba09e9214882 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 23 Mar 2013 11:15:11 +1100 Subject: [PATCH] BungeeCord Support @@ -53,7 +53,7 @@ index 3bfd29b..bce217e 100644 if (metrics == null) { try { diff --git a/src/main/resources/configurations/bukkit.yml b/src/main/resources/configurations/bukkit.yml -index 9cfee2d..64f68a2 100644 +index 35056d9..df8dfaa 100644 --- a/src/main/resources/configurations/bukkit.yml +++ b/src/main/resources/configurations/bukkit.yml @@ -35,6 +35,8 @@ settings: diff --git a/CraftBukkit-Patches/0042-Texture-Pack-Resolutions.patch b/CraftBukkit-Patches/0041-Texture-Pack-Resolutions.patch similarity index 96% rename from CraftBukkit-Patches/0042-Texture-Pack-Resolutions.patch rename to CraftBukkit-Patches/0041-Texture-Pack-Resolutions.patch index bbf54702ad..695fc431fc 100644 --- a/CraftBukkit-Patches/0042-Texture-Pack-Resolutions.patch +++ b/CraftBukkit-Patches/0041-Texture-Pack-Resolutions.patch @@ -1,4 +1,4 @@ -From 4a8f60ad4f5babc013cd49f510bea117f9356cc3 Mon Sep 17 00:00:00 2001 +From b2a141a19dbaeee632b24975df66523116d0fe8b Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 23 Mar 2013 13:04:45 +1100 Subject: [PATCH] Texture Pack Resolutions @@ -45,7 +45,7 @@ index bce217e..8fd635f 100644 if (metrics == null) { try { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 3c34a4c..8361614 100644 +index a7abd6e..56cdfb7 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -828,7 +828,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -58,7 +58,7 @@ index 3c34a4c..8361614 100644 getHandle().playerConnection.sendPacket(new Packet250CustomPayload("MC|TPack", message)); diff --git a/src/main/resources/configurations/bukkit.yml b/src/main/resources/configurations/bukkit.yml -index 64f68a2..4034c6f 100644 +index df8dfaa..bc0b044 100644 --- a/src/main/resources/configurations/bukkit.yml +++ b/src/main/resources/configurations/bukkit.yml @@ -37,6 +37,7 @@ settings: diff --git a/CraftBukkit-Patches/0043-Entity-Tracking-Intervals.patch b/CraftBukkit-Patches/0042-Entity-Tracking-Intervals.patch similarity index 94% rename from CraftBukkit-Patches/0043-Entity-Tracking-Intervals.patch rename to CraftBukkit-Patches/0042-Entity-Tracking-Intervals.patch index 351c383744..19d8f6abc4 100644 --- a/CraftBukkit-Patches/0043-Entity-Tracking-Intervals.patch +++ b/CraftBukkit-Patches/0042-Entity-Tracking-Intervals.patch @@ -1,4 +1,4 @@ -From 1f2c584ebbd256e9e1842da982aa48ad0ab98b80 Mon Sep 17 00:00:00 2001 +From 98830ca8c740c06391a4c4a0d08044299d244d2c Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 23 Mar 2013 13:31:23 +1100 Subject: [PATCH] Entity Tracking Intervals diff --git a/CraftBukkit-Patches/0044-Limit-Custom-Map-Rendering.patch b/CraftBukkit-Patches/0043-Limit-Custom-Map-Rendering.patch similarity index 98% rename from CraftBukkit-Patches/0044-Limit-Custom-Map-Rendering.patch rename to CraftBukkit-Patches/0043-Limit-Custom-Map-Rendering.patch index 6c399fa3d1..4dbf09fe75 100644 --- a/CraftBukkit-Patches/0044-Limit-Custom-Map-Rendering.patch +++ b/CraftBukkit-Patches/0043-Limit-Custom-Map-Rendering.patch @@ -1,4 +1,4 @@ -From 385fdb39fa4e899ba325c9d525204814ea36cc5f Mon Sep 17 00:00:00 2001 +From eab583f5316f3d7e32c74c9f613139e82dad849c Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 23 Mar 2013 19:08:41 +1100 Subject: [PATCH] Limit Custom Map Rendering