From bb2e089f27fd2d7209e735e2857480a8618c3cb6 Mon Sep 17 00:00:00 2001
From: creeper123123321 <creeper123123321@gmail.com>
Date: Sat, 20 Apr 2019 18:33:29 -0300
Subject: [PATCH] Set item to null when shift clicking

---
 .../packets/BlockItemPackets1_12.java                 | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/BlockItemPackets1_12.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/BlockItemPackets1_12.java
index f07105f5..e297e819 100644
--- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/BlockItemPackets1_12.java
+++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/BlockItemPackets1_12.java
@@ -174,14 +174,17 @@ public class BlockItemPackets1_12 extends BlockItemRewriter<Protocol1_11_1To1_12
                             @Override
                             public void handle(PacketWrapper wrapper) throws Exception {
                                 if (wrapper.get(Type.VAR_INT, 0) == 1) { // Shift click
-                                    CompoundTag tag = new CompoundTag("");
-                                    tag.put(new DoubleTag("force reject", Double.NaN));
-                                    wrapper.set(Type.ITEM, 0, new Item((short) 1, (byte) 1, (short) 1, tag));
+                                    // https://github.com/ViaVersion/ViaVersion/pull/754
+                                    // Previously clients grab the item from the clicked slot *before* it has
+                                    // been moved however now they grab the slot item *after* it has been moved
+                                    // and send that in the packet.
+                                    wrapper.set(Type.ITEM, 0, null); // Set null item (probably will work)
 
+                                    // Apologize (may happen in some cases, maybe if inventory is full?)
                                     PacketWrapper confirm = wrapper.create(0x6);
                                     confirm.write(Type.BYTE, wrapper.get(Type.UNSIGNED_BYTE, 0).byteValue());
                                     confirm.write(Type.SHORT, wrapper.get(Type.SHORT, 1));
-                                    confirm.write(Type.BOOLEAN, false);
+                                    confirm.write(Type.BOOLEAN, false); // Success - not used
 
                                     wrapper.sendToServer(Protocol1_11_1To1_12.class, true, true);
                                     wrapper.cancel();