36 Zeilen
2.1 KiB
Diff
36 Zeilen
2.1 KiB
Diff
|
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/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
|
||
|
|
index 24dfdb3807dbf6e9acc59d35d7c76f7ac0185219..72df753d8c8e12cb3efaa02f37b05496701cc9f9 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
|
||
|
|
@@ -1708,6 +1708,10 @@ public class PlayerConnection implements PacketListenerPlayIn {
|
||
|
|
this.player.getBukkitEntity().updateInventory(); // SPIGOT-2524
|
||
|
|
return;
|
||
|
|
}
|
||
|
|
+ // Paper start
|
||
|
|
+ itemstack = this.player.getItemInHand(enumhand);
|
||
|
|
+ if (itemstack.isEmpty()) return;
|
||
|
|
+ // Paper end
|
||
|
|
EnumInteractionResult enuminteractionresult = this.player.playerInteractManager.a(this.player, worldserver, itemstack, enumhand);
|
||
|
|
|
||
|
|
if (enuminteractionresult.b()) {
|
||
|
|
diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
|
||
|
|
index 48f932b2e049741ebee5824e158e4bda87d42faf..cd880fb9e61dad7dff185d0b4fa2b8c5dee04861 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
|
||
|
|
@@ -2156,6 +2156,7 @@ public abstract class EntityLiving extends Entity {
|
||
|
|
return predicate.test(this.getItemInMainHand().getItem()) || predicate.test(this.getItemInOffHand().getItem());
|
||
|
|
}
|
||
|
|
|
||
|
|
+ public final 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);
|