Remove extra inventory close event patch, because despite being a legitimate bug fix, it will not be pulled by Bukkit, so plugins must resort to other means to catch this last event.

This commit is contained in:
md_5 2013-04-23 11:37:51 +10:00
parent 7c8c784aab
commit 18520d21b2
32 changed files with 32 additions and 72 deletions

View File

@ -1,40 +0,0 @@
From b310fa74d48b5a1f347cfbe393f5eb0ea1f14a0e Mon Sep 17 00:00:00 2001
From: md_5 <md_5@bigpond.com>
Date: Sun, 23 Dec 2012 17:09:40 +1100
Subject: [PATCH] Address BUKKIT-3286 by firing the inventory close event when
a secondary container is closed due to the player entity being destroyed.
This covers all edge cases such as server stop / player kick / player quit.
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index d647d2e..f948497 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -5,11 +5,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;
@@ -961,6 +963,10 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen
super.die();
this.defaultContainer.b(this);
if (this.activeContainer != null) {
+ // CraftBukkit start
+ InventoryCloseEvent event = new InventoryCloseEvent(this.activeContainer.getBukkitView());
+ Bukkit.getServer().getPluginManager().callEvent(event);
+ // CraftBukkit end
this.activeContainer.b(this);
}
}
--
1.8.2.1

View File

@ -1,4 +1,4 @@
From d84c1f7342f30987a074d105d4d8ba1a510cbfcf Mon Sep 17 00:00:00 2001
From c049344dec44e8f266b1f692fd9384936911c826 Mon Sep 17 00:00:00 2001
From: Mike Primm <mike@primmhome.com>
Date: Sun, 13 Jan 2013 03:49:07 -0800
Subject: [PATCH] Implement 'lightening' of NibbleArrays - only allocate

View File

@ -1,4 +1,4 @@
From aff3169422b56400dd86e91e6cfff87fb2f8d41a Mon Sep 17 00:00:00 2001
From 9542a9f8645de176e39d33694e930872ee7a42d8 Mon Sep 17 00:00:00 2001
From: Ammar Askar <ammar@ammaraskar.com>
Date: Fri, 18 Jan 2013 16:20:01 +0500
Subject: [PATCH] Optimize packet used to unload chunks for the client

View File

@ -1,4 +1,4 @@
From b70e8e675c6c9b47fc4c4a31d29a27468c3ab974 Mon Sep 17 00:00:00 2001
From 6591b85a8d8dba678747feafc3e0bcec83bd6979 Mon Sep 17 00:00:00 2001
From: Mike Primm <mike@primmhome.com>
Date: Wed, 16 Jan 2013 15:27:22 -0600
Subject: [PATCH] Alternate, sync-free-but-safe chunk reference cache

View File

@ -1,4 +1,4 @@
From fb71acadb1e590cf6759067258e5f9da22675cf8 Mon Sep 17 00:00:00 2001
From e39a30a154d3dfe558935df053cd854ed66b184a Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 3 Feb 2013 12:28:17 +1100
Subject: [PATCH] Tick loop optimization - sleep for as long as possible.

View File

@ -1,4 +1,4 @@
From 82d081b636d0a51ea6773b49f665863444d9fe52 Mon Sep 17 00:00:00 2001
From 41be88f8ac09bd5c654ed1d413da940966f355d0 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 10 Jan 2013 00:18:11 -0500
Subject: [PATCH] Improved Timings System

View File

@ -1,4 +1,4 @@
From 438a941956c79e8a33f240b32cba493dee72ef2d Mon Sep 17 00:00:00 2001
From 1155f9606b7e8061b1ab5c19910133f7a0b40192 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 23 Mar 2013 10:58:17 +1100
Subject: [PATCH] Add oreobfuscator for Spigot.

View File

@ -1,4 +1,4 @@
From b1337b27a8444cbd78141b52282f5a2b2986961f Mon Sep 17 00:00:00 2001
From bfbd9c222d0c5d8169ea3545e05c318e42835dd3 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 29 Jan 2013 13:25:53 -0500
Subject: [PATCH] Only count entities in chunks being processed for the spawn

View File

@ -1,4 +1,4 @@
From 3a84358a28ed01c59aa397d8620d382ecb7d3391 Mon Sep 17 00:00:00 2001
From 640e63f7708ad09e2a48f86cbd94692d5bd12094 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 3 Feb 2013 09:20:19 +1100
Subject: [PATCH] Detect, remove and warn about null tile entities.

View File

@ -1,4 +1,4 @@
From b47ddfa47df6df27713074bc7a5ceeb912026ebd Mon Sep 17 00:00:00 2001
From 652752f24fa214ce92cdb698689df4d5dc7b1e6c Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 3 Feb 2013 05:10:21 -0500
Subject: [PATCH] Entity Activation Range

View File

@ -1,4 +1,4 @@
From b34586f9690cc7869fc54917df30d3a0413beff8 Mon Sep 17 00:00:00 2001
From c5c660bfcf54efd713bb1bb241cc1acdb294e126 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 23 Feb 2013 08:58:35 +1100
Subject: [PATCH] Metrics. Rewrite the Metrics system to be closer to the

View File

@ -1,4 +1,4 @@
From b23a6f7978ef79948ab15b9126d199df6e5c2865 Mon Sep 17 00:00:00 2001
From f6790305aeed1bb428e4e666a078fb68482bf3b1 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 23 Feb 2013 12:33:20 +1100
Subject: [PATCH] Watchdog Thread.

View File

@ -1,4 +1,4 @@
From ae36f22f9f3befe76565e9488da1ed48fe93987a Mon Sep 17 00:00:00 2001
From 37052de31a36a7565122c58b9fe743dc2a046e45 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Fri, 19 Apr 2013 17:44:39 +1000
Subject: [PATCH] Netty
@ -32,7 +32,7 @@ Subject: [PATCH] Netty
Commons Attribution-ShareAlike 3.0 Unported license.
diff --git a/pom.xml b/pom.xml
index da1a0eb..b8c24af 100644
index 3e02cc3..f2b6e35 100644
--- a/pom.xml
+++ b/pom.xml
@@ -132,6 +132,11 @@

View File

@ -1,4 +1,4 @@
From 03988d5e8c3377bf241a8160c1845bbdb9ae0502 Mon Sep 17 00:00:00 2001
From 6ba8ff41998d09eba7c4ae798d27c21ff1fd5762 Mon Sep 17 00:00:00 2001
From: EdGruberman <ed@rjump.com>
Date: Fri, 22 Feb 2013 09:23:51 -0700
Subject: [PATCH] Return bed location itself instead of next to bed; Fixes

View File

@ -1,4 +1,4 @@
From 1d22c36f1f307d7ea7888e4dd20a4529363f95db Mon Sep 17 00:00:00 2001
From 437f4f06845834005b4f6a4b29e6dfb48dc43e12 Mon Sep 17 00:00:00 2001
From: EdGruberman <ed@rjump.com>
Date: Tue, 12 Feb 2013 16:17:31 -0700
Subject: [PATCH] Remove dependency on CraftPlayer.getBedSpawnLocation; Fixes

View File

@ -1,4 +1,4 @@
From afee99028e8ff63527b84091ede331283abc7ef4 Mon Sep 17 00:00:00 2001
From bfca37c383ed00f8bd8bc0bc7d6ef8cbb88a8956 Mon Sep 17 00:00:00 2001
From: Yariv Livay <yarivlivay@gmail.com>
Date: Sat, 2 Mar 2013 09:36:52 +1100
Subject: [PATCH] BUKKIT-3661, fixed missing HangingBreakEvent when

View File

@ -1,4 +1,4 @@
From 0c7dc7ea5b5965a3cff0317bf90deba48227b61e Mon Sep 17 00:00:00 2001
From c68181f54fb20ca5f5cd49bc8a9b43924171ab9d Mon Sep 17 00:00:00 2001
From: Yariv Livay <yarivlivay@gmail.com>
Date: Mon, 25 Feb 2013 22:26:36 +0200
Subject: [PATCH] Adds BUKKIT-3667, Faux sleepers wake up normally

View File

@ -1,4 +1,4 @@
From 525421dbffa6016d81331c6c9a1a15be02917865 Mon Sep 17 00:00:00 2001
From c542317812b69c939334e3fd219fc21285e63138 Mon Sep 17 00:00:00 2001
From: Yariv Livay <yarivlivay@gmail.com>
Date: Tue, 26 Feb 2013 20:14:34 +0200
Subject: [PATCH] BUKKIT-3668 Fix wrong block in BlockDispenseEvent when

View File

@ -1,4 +1,4 @@
From 3078ae0eef8f68ae05ebc2107746ccf6965713cf Mon Sep 17 00:00:00 2001
From ce904408636bb5118204626e7d83403be27e7aa6 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Mon, 4 Mar 2013 18:45:52 +1100
Subject: [PATCH] PlayerItemDamageEvent

View File

@ -1,4 +1,4 @@
From 90ba774bcafa370b5cd082f0d4aa8a7d717dae1e Mon Sep 17 00:00:00 2001
From 5e437957841f72b02e11b9c257a5ac419aa5f43e Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 17 Mar 2013 19:02:50 +1100
Subject: [PATCH] Faster UUID for entities

View File

@ -1,4 +1,4 @@
From bb19263eed54f52fe0b0dd8d8bff649073016fff Mon Sep 17 00:00:00 2001
From 38e8948efeb9bf5b95d30e2ccf13ee16787bf257 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Mon, 18 Mar 2013 20:01:44 +1100
Subject: [PATCH] Prevent NPE in CraftSign

View File

@ -1,4 +1,4 @@
From ea0a53558ac6f173d2dae99e1152e8a09b4c083b Mon Sep 17 00:00:00 2001
From f150656dd050bd27cf973319921bd5edaeb445ef Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Thu, 21 Mar 2013 17:00:54 +1100
Subject: [PATCH] Stage DataWatcher & WatchableObject.

View File

@ -1,4 +1,4 @@
From 15fc2a6fa3f0ed848e928ff0da1f3a31edaed0c5 Mon Sep 17 00:00:00 2001
From facb4f20791fa2f225e3dc727923035bfebb8b09 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 20 Feb 2013 11:58:47 -0500
Subject: [PATCH] Entity Tracking Ranges

View File

@ -1,4 +1,4 @@
From 54be87d488966a3576c47be9ac175ece46909e8e Mon Sep 17 00:00:00 2001
From b2c322170b2b5d4b0f25680bd1f63592a3cdee43 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 23 Mar 2013 11:15:11 +1100
Subject: [PATCH] BungeeCord Support

View File

@ -1,4 +1,4 @@
From f3d344a14e5c28ede7d04415149d8277344e5e66 Mon Sep 17 00:00:00 2001
From a4e6123ad2e10c7aa69cd196913c9decc4390472 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 23 Mar 2013 13:04:45 +1100
Subject: [PATCH] Texture Pack Resolutions

View File

@ -1,4 +1,4 @@
From 0c5d5c8f8863549c7b36e7d557a76889765f5961 Mon Sep 17 00:00:00 2001
From 2ef5eefd8a0c8d7cd62ac2e06125498151e82cf8 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 23 Mar 2013 19:08:41 +1100
Subject: [PATCH] Limit Custom Map Rendering

View File

@ -1,4 +1,4 @@
From 4a583d6032b6063f3dccca708faafd27bc0000fb Mon Sep 17 00:00:00 2001
From 069d9d32aa69bf222282dd892c5948394905defd Mon Sep 17 00:00:00 2001
From: Hudson <hudson@mydomain.com>
Date: Wed, 3 Apr 2013 02:16:56 -0500
Subject: [PATCH] Revert "Throw exception for disabled plugin tasks. Fixes

View File

@ -1,4 +1,4 @@
From b14ef0d35041dd0711f8da12b7bc82c544ae1ec9 Mon Sep 17 00:00:00 2001
From d7e2842e4c89045f0f2eed6ac58a6326daa905d0 Mon Sep 17 00:00:00 2001
From: Tyler Blair <hidendra@griefcraft.com>
Date: Tue, 9 Apr 2013 17:55:15 -0300
Subject: [PATCH] InventoryClickEvent now can return if the click was a double

View File

@ -1,4 +1,4 @@
From 3c78de6884305234b68a65f73680907263b66413 Mon Sep 17 00:00:00 2001
From d419dd29e1778c4858269b2f6bfd002387285673 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 24 Feb 2013 20:45:20 +1100
Subject: [PATCH] Enable Improved ping sending

View File

@ -1,4 +1,4 @@
From 54aa49bd3dccd1b9b209cbd4f81b08208d586b3a Mon Sep 17 00:00:00 2001
From eba3ae1b89ac9d2387bf6cc2be735a2f30806ee1 Mon Sep 17 00:00:00 2001
From: Benjamin James Harrison-Sims <tehrainbowguy@gmail.com>
Date: Sun, 14 Apr 2013 21:19:57 +0500
Subject: [PATCH] Prevent handshake spam from invalid names.

View File

@ -1,4 +1,4 @@
From 7a6aea043ba36689910286ee7fbb3dff03766bf9 Mon Sep 17 00:00:00 2001
From cea8e2c5e01c5b382f91b906f442738f9389c7b9 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Fri, 19 Apr 2013 19:13:42 +1000
Subject: [PATCH] Snapshot Protocol

View File

@ -1,4 +1,4 @@
From 13861d6edb0b265eb0fe878e06c420495dbd7b53 Mon Sep 17 00:00:00 2001
From f40950506177bd7115bfacfbb892e698e1ea7775 Mon Sep 17 00:00:00 2001
From: Ammar Askar <ammar@ammaraskar.com>
Date: Sat, 20 Apr 2013 12:26:20 +0500
Subject: [PATCH] Save entity counts for randomly spawned creatures to avoid