From 0edbf1f0d83633a5ff089d00728d5bc0e7b6b484 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 3 Mar 2013 09:37:31 +1100 Subject: [PATCH] CB has now merged the commits we pulled, so they can be removed. --- ...286-by-firing-the-inventory-close-ev.patch | 9 ++- ...> 0030-Enable-Improved-ping-sending.patch} | 4 +- ...xception-for-built-in-PluginChannels.patch | 77 ------------------- ...istance.patch => 0031-View-distance.patch} | 2 +- ...on-itself-instead-of-next-to-bed-Fi.patch} | 2 +- ...-on-CraftPlayer.getBedSpawnLocation.patch} | 2 +- ...CB-object-for-ContainerBrewingStand..patch | 35 --------- ...slot-independent-of-inventory-type-.patch} | 2 +- ...-missing-HangingBreakEvent-when-Ent.patch} | 2 +- ...3667-Faux-sleepers-wake-up-normally.patch} | 2 +- ...rong-block-in-BlockDispenseEvent-wh.patch} | 2 +- ...now-reset-text-attributes.-Fixes-BU.patch} | 2 +- ...port.patch => 0039-Snapshot-support.patch} | 2 +- 13 files changed, 16 insertions(+), 127 deletions(-) rename CraftBukkit-Patches/{0031-Enable-Improved-ping-sending.patch => 0030-Enable-Improved-ping-sending.patch} (96%) delete mode 100644 CraftBukkit-Patches/0030-Kick-player-on-exception-for-built-in-PluginChannels.patch rename CraftBukkit-Patches/{0032-View-distance.patch => 0031-View-distance.patch} (93%) rename CraftBukkit-Patches/{0034-Return-bed-location-itself-instead-of-next-to-bed-Fi.patch => 0032-Return-bed-location-itself-instead-of-next-to-bed-Fi.patch} (96%) rename CraftBukkit-Patches/{0035-Remove-dependency-on-CraftPlayer.getBedSpawnLocation.patch => 0033-Remove-dependency-on-CraftPlayer.getBedSpawnLocation.patch} (96%) delete mode 100644 CraftBukkit-Patches/0033-Use-the-correct-CB-object-for-ContainerBrewingStand..patch rename CraftBukkit-Patches/{0036-Identify-outside-slot-independent-of-inventory-type-.patch => 0034-Identify-outside-slot-independent-of-inventory-type-.patch} (94%) rename CraftBukkit-Patches/{0037-BUKKIT-3661-fixed-missing-HangingBreakEvent-when-Ent.patch => 0035-BUKKIT-3661-fixed-missing-HangingBreakEvent-when-Ent.patch} (96%) rename CraftBukkit-Patches/{0038-Adds-BUKKIT-3667-Faux-sleepers-wake-up-normally.patch => 0036-Adds-BUKKIT-3667-Faux-sleepers-wake-up-normally.patch} (94%) rename CraftBukkit-Patches/{0039-BUKKIT-3668-Fix-wrong-block-in-BlockDispenseEvent-wh.patch => 0037-BUKKIT-3668-Fix-wrong-block-in-BlockDispenseEvent-wh.patch} (94%) rename CraftBukkit-Patches/{0040-ANSI-color-codes-now-reset-text-attributes.-Fixes-BU.patch => 0038-ANSI-color-codes-now-reset-text-attributes.-Fixes-BU.patch} (98%) rename CraftBukkit-Patches/{0041-Snapshot-support.patch => 0039-Snapshot-support.patch} (99%) diff --git a/CraftBukkit-Patches/0003-Address-BUKKIT-3286-by-firing-the-inventory-close-ev.patch b/CraftBukkit-Patches/0003-Address-BUKKIT-3286-by-firing-the-inventory-close-ev.patch index f314d7585..fa686ea67 100644 --- a/CraftBukkit-Patches/0003-Address-BUKKIT-3286-by-firing-the-inventory-close-ev.patch +++ b/CraftBukkit-Patches/0003-Address-BUKKIT-3286-by-firing-the-inventory-close-ev.patch @@ -1,4 +1,4 @@ -From 748657f2ca08bb10cdd55a063cd78cf0ab51fc4a Mon Sep 17 00:00:00 2001 +From 7c1be72b82a1dc2af199e0184fea60dd6fad252d Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 23 Dec 2012 17:09:40 +1100 Subject: [PATCH] Address BUKKIT-3286 by firing the inventory close event when @@ -10,23 +10,24 @@ Subject: [PATCH] Address BUKKIT-3286 by firing the inventory close event when 1 file changed, 6 insertions(+) diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 7afa68e..c6f8ff9 100644 +index ce0715b..028ba0c 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java -@@ -4,10 +4,12 @@ import java.util.Iterator; +@@ -4,11 +4,13 @@ import java.util.Iterator; import java.util.List; // CraftBukkit start +import org.bukkit.Bukkit; import org.bukkit.craftbukkit.entity.CraftHumanEntity; import org.bukkit.craftbukkit.entity.CraftItem; + import org.bukkit.craftbukkit.inventory.CraftItemStack; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityCombustByEntityEvent; +import org.bukkit.event.inventory.InventoryCloseEvent; import org.bukkit.event.player.PlayerBedEnterEvent; import org.bukkit.event.player.PlayerBedLeaveEvent; import org.bukkit.event.player.PlayerDropItemEvent; -@@ -883,6 +885,10 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen +@@ -911,6 +913,10 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen super.die(); this.defaultContainer.b(this); if (this.activeContainer != null) { diff --git a/CraftBukkit-Patches/0031-Enable-Improved-ping-sending.patch b/CraftBukkit-Patches/0030-Enable-Improved-ping-sending.patch similarity index 96% rename from CraftBukkit-Patches/0031-Enable-Improved-ping-sending.patch rename to CraftBukkit-Patches/0030-Enable-Improved-ping-sending.patch index 78a98897b..7652ec7f2 100644 --- a/CraftBukkit-Patches/0031-Enable-Improved-ping-sending.patch +++ b/CraftBukkit-Patches/0030-Enable-Improved-ping-sending.patch @@ -1,4 +1,4 @@ -From 8f43d31d0e67908e97627327ed3421574970f2d5 Mon Sep 17 00:00:00 2001 +From e92e872b2cb6bc659372997d6e08cd3489a78162 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 24 Feb 2013 20:45:20 +1100 Subject: [PATCH] Enable Improved ping sending @@ -50,7 +50,7 @@ index d13fa19..6c19ad7 100644 public void sendAll(Packet packet) { for (int i = 0; i < this.players.size(); ++i) { diff --git a/src/main/resources/configurations/bukkit.yml b/src/main/resources/configurations/bukkit.yml -index e04ebce..03fff4c 100644 +index 7c18391..aac1406 100644 --- a/src/main/resources/configurations/bukkit.yml +++ b/src/main/resources/configurations/bukkit.yml @@ -31,6 +31,7 @@ settings: diff --git a/CraftBukkit-Patches/0030-Kick-player-on-exception-for-built-in-PluginChannels.patch b/CraftBukkit-Patches/0030-Kick-player-on-exception-for-built-in-PluginChannels.patch deleted file mode 100644 index 1db74c8f1..000000000 --- a/CraftBukkit-Patches/0030-Kick-player-on-exception-for-built-in-PluginChannels.patch +++ /dev/null @@ -1,77 +0,0 @@ -From f79f9c8a4b8dea443b5477c742d76f4ca8a780bb Mon Sep 17 00:00:00 2001 -From: Eimref -Date: Wed, 6 Feb 2013 18:59:07 -0500 -Subject: [PATCH] Kick player on exception for built-in PluginChannels; Fixes - BUKKIT-3583 - ---- - src/main/java/net/minecraft/server/PlayerConnection.java | 11 ++++++++--- - 1 file changed, 8 insertions(+), 3 deletions(-) - -diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index d2c2305..b960a87 100644 ---- a/src/main/java/net/minecraft/server/PlayerConnection.java -+++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -1481,6 +1481,7 @@ public class PlayerConnection extends Connection { - } - } catch (Exception exception) { - exception.printStackTrace(); -+ this.disconnect("Invalid book data!"); // CraftBukkit - prevent exception spam - } - } else if ("MC|BSign".equals(packet250custompayload.tag)) { - try { -@@ -1498,9 +1499,8 @@ public class PlayerConnection extends Connection { - itemstack1.id = Item.WRITTEN_BOOK.id; - } - } catch (Exception exception1) { -- // CraftBukkit start -- // exception1.printStackTrace(); -- // CraftBukkit end -+ exception1.printStackTrace(); -+ this.disconnect("Invalid book data!"); // CraftBukkit - prevent exception spam - } - } else { - int i; -@@ -1516,6 +1516,7 @@ public class PlayerConnection extends Connection { - } - } catch (Exception exception2) { - exception2.printStackTrace(); -+ this.disconnect("Invalid trade data!"); // CraftBukkit - prevent exception spam - } - } else { - int j; -@@ -1539,6 +1540,7 @@ public class PlayerConnection extends Connection { - } - } catch (Exception exception3) { - exception3.printStackTrace(); -+ this.disconnect("Invalid CommandBlock data!"); // CraftBukkit - prevent exception spam - } - } else { - this.player.sendMessage(this.player.a("advMode.notAllowed", new Object[0])); -@@ -1562,6 +1564,7 @@ public class PlayerConnection extends Connection { - } - } catch (Exception exception4) { - exception4.printStackTrace(); -+ this.disconnect("Invalid beacon data!"); // CraftBukkit - prevent exception spam - } - } - } else if ("MC|ItemName".equals(packet250custompayload.tag) && this.player.activeContainer instanceof ContainerAnvil) { -@@ -1586,6 +1589,7 @@ public class PlayerConnection extends Connection { - } - } catch (UnsupportedEncodingException ex) { - Logger.getLogger(PlayerConnection.class.getName()).log(Level.SEVERE, "Could not parse REGISTER payload in plugin message packet", ex); -+ throw new AssertionError("UTF-8 is an unknown encoding"); - } - } else if (packet250custompayload.tag.equals("UNREGISTER")) { - try { -@@ -1595,6 +1599,7 @@ public class PlayerConnection extends Connection { - } - } catch (UnsupportedEncodingException ex) { - Logger.getLogger(PlayerConnection.class.getName()).log(Level.SEVERE, "Could not parse UNREGISTER payload in plugin message packet", ex); -+ throw new AssertionError("UTF-8 is an unknown encoding"); - } - } else { - server.getMessenger().dispatchIncomingMessage(player.getBukkitEntity(), packet250custompayload.tag, packet250custompayload.data); --- -1.8.1.1 - diff --git a/CraftBukkit-Patches/0032-View-distance.patch b/CraftBukkit-Patches/0031-View-distance.patch similarity index 93% rename from CraftBukkit-Patches/0032-View-distance.patch rename to CraftBukkit-Patches/0031-View-distance.patch index a8d438928..f025dce27 100644 --- a/CraftBukkit-Patches/0032-View-distance.patch +++ b/CraftBukkit-Patches/0031-View-distance.patch @@ -1,4 +1,4 @@ -From 599b8c109e266ac0f0882157d2491137d93dfe91 Mon Sep 17 00:00:00 2001 +From c21493df1c0843aeee5dc87d7f4d41637719d153 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 26 Feb 2013 11:31:27 +1100 Subject: [PATCH] View distance. diff --git a/CraftBukkit-Patches/0034-Return-bed-location-itself-instead-of-next-to-bed-Fi.patch b/CraftBukkit-Patches/0032-Return-bed-location-itself-instead-of-next-to-bed-Fi.patch similarity index 96% rename from CraftBukkit-Patches/0034-Return-bed-location-itself-instead-of-next-to-bed-Fi.patch rename to CraftBukkit-Patches/0032-Return-bed-location-itself-instead-of-next-to-bed-Fi.patch index 098534460..0c4ec08cd 100644 --- a/CraftBukkit-Patches/0034-Return-bed-location-itself-instead-of-next-to-bed-Fi.patch +++ b/CraftBukkit-Patches/0032-Return-bed-location-itself-instead-of-next-to-bed-Fi.patch @@ -1,4 +1,4 @@ -From 66987b733cfa6bae2ce639c9d75cbb5521ca7795 Mon Sep 17 00:00:00 2001 +From 0f4418baaace7b3348b268403328c853326d0e39 Mon Sep 17 00:00:00 2001 From: EdGruberman Date: Fri, 22 Feb 2013 09:23:51 -0700 Subject: [PATCH] Return bed location itself instead of next to bed; Fixes diff --git a/CraftBukkit-Patches/0035-Remove-dependency-on-CraftPlayer.getBedSpawnLocation.patch b/CraftBukkit-Patches/0033-Remove-dependency-on-CraftPlayer.getBedSpawnLocation.patch similarity index 96% rename from CraftBukkit-Patches/0035-Remove-dependency-on-CraftPlayer.getBedSpawnLocation.patch rename to CraftBukkit-Patches/0033-Remove-dependency-on-CraftPlayer.getBedSpawnLocation.patch index 505a2750a..ecaa19379 100644 --- a/CraftBukkit-Patches/0035-Remove-dependency-on-CraftPlayer.getBedSpawnLocation.patch +++ b/CraftBukkit-Patches/0033-Remove-dependency-on-CraftPlayer.getBedSpawnLocation.patch @@ -1,4 +1,4 @@ -From b4cc885d617030d855a069079d7962ae42fe6373 Mon Sep 17 00:00:00 2001 +From 01db0ede45b595ea3713690c2f9fb91a337f4b95 Mon Sep 17 00:00:00 2001 From: EdGruberman Date: Tue, 12 Feb 2013 16:17:31 -0700 Subject: [PATCH] Remove dependency on CraftPlayer.getBedSpawnLocation; Fixes diff --git a/CraftBukkit-Patches/0033-Use-the-correct-CB-object-for-ContainerBrewingStand..patch b/CraftBukkit-Patches/0033-Use-the-correct-CB-object-for-ContainerBrewingStand..patch deleted file mode 100644 index 0d127d3e3..000000000 --- a/CraftBukkit-Patches/0033-Use-the-correct-CB-object-for-ContainerBrewingStand..patch +++ /dev/null @@ -1,35 +0,0 @@ -From 430be099c8edaae4a11f1ede38fc9f22a8c5967f Mon Sep 17 00:00:00 2001 -From: Nate Mortensen -Date: Fri, 8 Feb 2013 19:22:22 -0700 -Subject: [PATCH] Use the correct CB object for ContainerBrewingStand. Fixes - BUKKIT-3357. - ---- - src/main/java/net/minecraft/server/ContainerBrewingStand.java | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/main/java/net/minecraft/server/ContainerBrewingStand.java b/src/main/java/net/minecraft/server/ContainerBrewingStand.java -index 3bfa802..3411dbb 100644 ---- a/src/main/java/net/minecraft/server/ContainerBrewingStand.java -+++ b/src/main/java/net/minecraft/server/ContainerBrewingStand.java -@@ -1,7 +1,7 @@ - package net.minecraft.server; - - // CraftBukkit start --import org.bukkit.craftbukkit.inventory.CraftInventory; -+import org.bukkit.craftbukkit.inventory.CraftInventoryBrewer; - import org.bukkit.craftbukkit.inventory.CraftInventoryView; - // CraftBukkit end - -@@ -118,7 +118,7 @@ public class ContainerBrewingStand extends Container { - return bukkitEntity; - } - -- CraftInventory inventory = new CraftInventory(this.brewingStand); -+ CraftInventoryBrewer inventory = new CraftInventoryBrewer(this.brewingStand); - bukkitEntity = new CraftInventoryView(this.player.player.getBukkitEntity(), inventory, this); - return bukkitEntity; - } --- -1.8.1-rc2 - diff --git a/CraftBukkit-Patches/0036-Identify-outside-slot-independent-of-inventory-type-.patch b/CraftBukkit-Patches/0034-Identify-outside-slot-independent-of-inventory-type-.patch similarity index 94% rename from CraftBukkit-Patches/0036-Identify-outside-slot-independent-of-inventory-type-.patch rename to CraftBukkit-Patches/0034-Identify-outside-slot-independent-of-inventory-type-.patch index d9f1239b7..f91d4bcb7 100644 --- a/CraftBukkit-Patches/0036-Identify-outside-slot-independent-of-inventory-type-.patch +++ b/CraftBukkit-Patches/0034-Identify-outside-slot-independent-of-inventory-type-.patch @@ -1,4 +1,4 @@ -From a5d121d01e22ea78685acfed62dc7be01dfa789c Mon Sep 17 00:00:00 2001 +From e91df993c0de872acdd4d6bdb3d96780f6120874 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 diff --git a/CraftBukkit-Patches/0037-BUKKIT-3661-fixed-missing-HangingBreakEvent-when-Ent.patch b/CraftBukkit-Patches/0035-BUKKIT-3661-fixed-missing-HangingBreakEvent-when-Ent.patch similarity index 96% rename from CraftBukkit-Patches/0037-BUKKIT-3661-fixed-missing-HangingBreakEvent-when-Ent.patch rename to CraftBukkit-Patches/0035-BUKKIT-3661-fixed-missing-HangingBreakEvent-when-Ent.patch index 7a152e5df..9aed1e5c4 100644 --- a/CraftBukkit-Patches/0037-BUKKIT-3661-fixed-missing-HangingBreakEvent-when-Ent.patch +++ b/CraftBukkit-Patches/0035-BUKKIT-3661-fixed-missing-HangingBreakEvent-when-Ent.patch @@ -1,4 +1,4 @@ -From 256a6b7401b53e15483740d253e65a6124dee309 Mon Sep 17 00:00:00 2001 +From c5ab6f754ba26bbca5bbddcbfcb666ab91797a47 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/0038-Adds-BUKKIT-3667-Faux-sleepers-wake-up-normally.patch b/CraftBukkit-Patches/0036-Adds-BUKKIT-3667-Faux-sleepers-wake-up-normally.patch similarity index 94% rename from CraftBukkit-Patches/0038-Adds-BUKKIT-3667-Faux-sleepers-wake-up-normally.patch rename to CraftBukkit-Patches/0036-Adds-BUKKIT-3667-Faux-sleepers-wake-up-normally.patch index ee8aae8a8..ee4041e4e 100644 --- a/CraftBukkit-Patches/0038-Adds-BUKKIT-3667-Faux-sleepers-wake-up-normally.patch +++ b/CraftBukkit-Patches/0036-Adds-BUKKIT-3667-Faux-sleepers-wake-up-normally.patch @@ -1,4 +1,4 @@ -From 9ecf703c7fe76c70b811c525d40b548e4c0b3ca4 Mon Sep 17 00:00:00 2001 +From b8bb51ff362c990ef9cd991a5656cf823cbf2044 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/0039-BUKKIT-3668-Fix-wrong-block-in-BlockDispenseEvent-wh.patch b/CraftBukkit-Patches/0037-BUKKIT-3668-Fix-wrong-block-in-BlockDispenseEvent-wh.patch similarity index 94% rename from CraftBukkit-Patches/0039-BUKKIT-3668-Fix-wrong-block-in-BlockDispenseEvent-wh.patch rename to CraftBukkit-Patches/0037-BUKKIT-3668-Fix-wrong-block-in-BlockDispenseEvent-wh.patch index 172877424..f63f75d24 100644 --- a/CraftBukkit-Patches/0039-BUKKIT-3668-Fix-wrong-block-in-BlockDispenseEvent-wh.patch +++ b/CraftBukkit-Patches/0037-BUKKIT-3668-Fix-wrong-block-in-BlockDispenseEvent-wh.patch @@ -1,4 +1,4 @@ -From 2f89c4cf0ded941f290952d99a30c8a8e79f0d0c Mon Sep 17 00:00:00 2001 +From 2be562a064fd9341e1cfb8b298b5f77d66e9ce07 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/0040-ANSI-color-codes-now-reset-text-attributes.-Fixes-BU.patch b/CraftBukkit-Patches/0038-ANSI-color-codes-now-reset-text-attributes.-Fixes-BU.patch similarity index 98% rename from CraftBukkit-Patches/0040-ANSI-color-codes-now-reset-text-attributes.-Fixes-BU.patch rename to CraftBukkit-Patches/0038-ANSI-color-codes-now-reset-text-attributes.-Fixes-BU.patch index 4e757f060..b32d7f33d 100644 --- a/CraftBukkit-Patches/0040-ANSI-color-codes-now-reset-text-attributes.-Fixes-BU.patch +++ b/CraftBukkit-Patches/0038-ANSI-color-codes-now-reset-text-attributes.-Fixes-BU.patch @@ -1,4 +1,4 @@ -From eb1de092bd176ad81a94836ecd8202b4bf372003 Mon Sep 17 00:00:00 2001 +From 48984bf4577dd62bf48e92c4d09bcc39d530fa90 Mon Sep 17 00:00:00 2001 From: James Clarke Date: Sat, 26 Jan 2013 10:39:45 +0000 Subject: [PATCH] ANSI color codes now reset text attributes. Fixes BUKKIT-3508 diff --git a/CraftBukkit-Patches/0041-Snapshot-support.patch b/CraftBukkit-Patches/0039-Snapshot-support.patch similarity index 99% rename from CraftBukkit-Patches/0041-Snapshot-support.patch rename to CraftBukkit-Patches/0039-Snapshot-support.patch index 108245a7e..d47ab00ef 100644 --- a/CraftBukkit-Patches/0041-Snapshot-support.patch +++ b/CraftBukkit-Patches/0039-Snapshot-support.patch @@ -1,4 +1,4 @@ -From 4c02879800617a5b7b0f722afeb51f16ba43166d Mon Sep 17 00:00:00 2001 +From 1146814533f254505ea2e534109590ea7593c37b Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 2 Mar 2013 13:34:17 +1100 Subject: [PATCH] Snapshot support.