summaryrefslogtreecommitdiffstats
path: root/nms-patches
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2017-01-04 10:04:27 +1100
committermd_5 <git@md-5.net>2017-01-04 10:04:27 +1100
commit63b5f7d338b596531314f45de1227441c4d1f417 (patch)
treeef9262e5533c915ab69a995e0faef217fc7e80f7 /nms-patches
parent613be0d8418c044807040bb4c9b72ae4c118f5cd (diff)
downloadcraftbukkit-63b5f7d338b596531314f45de1227441c4d1f417.tar
craftbukkit-63b5f7d338b596531314f45de1227441c4d1f417.tar.gz
craftbukkit-63b5f7d338b596531314f45de1227441c4d1f417.tar.lz
craftbukkit-63b5f7d338b596531314f45de1227441c4d1f417.tar.xz
craftbukkit-63b5f7d338b596531314f45de1227441c4d1f417.zip
More robust inventory handling
Diffstat (limited to 'nms-patches')
-rw-r--r--nms-patches/PlayerConnection.patch3
1 files changed, 2 insertions, 1 deletions
diff --git a/nms-patches/PlayerConnection.patch b/nms-patches/PlayerConnection.patch
index 2b0731ab..251a1982 100644
--- a/nms-patches/PlayerConnection.patch
+++ b/nms-patches/PlayerConnection.patch
@@ -1129,8 +1129,9 @@
PlayerConnectionUtils.ensureMainThread(packetplayinwindowclick, this, this.player.x());
+ if (this.player.isFrozen()) return; // CraftBukkit
this.player.resetIdleTimer();
- if (this.player.activeContainer.windowId == packetplayinwindowclick.a() && this.player.activeContainer.c(this.player)) {
+- if (this.player.activeContainer.windowId == packetplayinwindowclick.a() && this.player.activeContainer.c(this.player)) {
- if (this.player.isSpectator()) {
++ if (this.player.activeContainer.windowId == packetplayinwindowclick.a() && this.player.activeContainer.c(this.player) && this.player.activeContainer.a(this.player)) { // CraftBukkit
+ boolean cancelled = this.player.isSpectator(); // CraftBukkit - see below if
+ if (false/*this.player.isSpectator()*/) { // CraftBukkit
NonNullList nonnulllist = NonNullList.a();