From 44f4a83e5920b889141f87c844ac3ef6e692d668 Mon Sep 17 00:00:00 2001
From: CraftBukkit/Spigot <noreply+git-craftbukkit@papermc.io>
Date: Wed, 4 Jan 2017 10:04:27 +1100
Subject: [PATCH] More robust inventory handling

By: md_5 <git@md-5.net>
---
 paper-server/nms-patches/PlayerConnection.patch | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/paper-server/nms-patches/PlayerConnection.patch b/paper-server/nms-patches/PlayerConnection.patch
index 2b0731abcc..251a1982dd 100644
--- a/paper-server/nms-patches/PlayerConnection.patch
+++ b/paper-server/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();