2021-06-11 12:02:28 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Lukasz Derlatka <toranktto@gmail.com>
|
|
|
|
|
Date: Mon, 11 Nov 2019 16:08:13 +0100
|
|
|
|
|
Subject: [PATCH] Fix AssertionError when player hand set to empty type
|
|
|
|
|
|
|
|
|
|
Fixes an AssertionError when setting the player's item in hand to null or a new ItemStack of Air in PlayerInteractEvent
|
|
|
|
|
Fixes GH-2718
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
2021-06-15 05:49:09 +00:00
|
|
|
index fc7776e081a76d52e5890ba05f750944e5a1d402..9c5eba2cbd7399c8e3f8c5c3dad228ded6d57832 100644
|
2021-06-11 12:02:28 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
|
|
|
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
2021-06-13 19:29:58 +00:00
|
|
|
@@ -1741,6 +1741,10 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
|
2021-06-11 12:02:28 +00:00
|
|
|
this.player.getBukkitEntity().updateInventory(); // SPIGOT-2524
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
+ // Paper start
|
|
|
|
|
+ itemstack = this.player.getItemInHand(enumhand);
|
|
|
|
|
+ if (itemstack.isEmpty()) return;
|
|
|
|
|
+ // Paper end
|
|
|
|
|
InteractionResult enuminteractionresult = this.player.gameMode.useItem(this.player, worldserver, itemstack, enumhand);
|
|
|
|
|
|
|
|
|
|
if (enuminteractionresult.shouldSwing()) {
|
