mirror of
https://github.com/PaperMC/Paper.git
synced 2024-07-02 17:54:57 +02:00
39 lines
1.8 KiB
Diff
39 lines
1.8 KiB
Diff
From 647617806e5119fabd4cdf467618f147868ffe40 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/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
|
|
index b098cd6d77..6184cced73 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityLiving.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
|
|
@@ -1888,6 +1888,7 @@ public abstract class EntityLiving extends Entity {
|
|
return this.getEquipment(EnumItemSlot.OFFHAND);
|
|
}
|
|
|
|
+ public ItemStack getItemInHand(EnumHand enumhand) { return this.b(enumhand); } // Paper - OBFHELPER
|
|
public ItemStack b(EnumHand enumhand) {
|
|
if (enumhand == EnumHand.MAIN_HAND) {
|
|
return this.getEquipment(EnumItemSlot.MAINHAND);
|
|
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
index f88bcb29db..108377d76e 100644
|
|
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
@@ -1430,6 +1430,10 @@ public class PlayerConnection implements PacketListenerPlayIn {
|
|
if (cancelled) {
|
|
this.player.getBukkitEntity().updateInventory(); // SPIGOT-2524
|
|
} else {
|
|
+ // Paper start
|
|
+ itemstack = this.player.getItemInHand(enumhand);
|
|
+ if (itemstack.isEmpty()) return;
|
|
+ // Paper end
|
|
this.player.playerInteractManager.a(this.player, worldserver, itemstack, enumhand);
|
|
}
|
|
// CraftBukkit end
|
|
--
|
|
2.25.1
|
|
|