19 lines
1.3 KiB
Diff
19 lines
1.3 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: chickeneer <emcchickeneer@gmail.com>
|
||
|
|
Date: Thu, 22 Apr 2021 19:02:07 -0700
|
||
|
|
Subject: [PATCH] fix PlayerItemHeldEvent firing twice
|
||
|
|
|
||
|
|
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||
|
|
index f5c79ec1293c72b738bb6bc1d0aa9d495eefe194..b154aa2d151babbe4341c6dbaec1753d1472215c 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||
|
|
@@ -1927,6 +1927,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
|
||
|
|
PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel());
|
||
|
|
if (this.player.isImmobile()) return; // CraftBukkit
|
||
|
|
if (packet.getSlot() >= 0 && packet.getSlot() < Inventory.getSelectionSize()) {
|
||
|
|
+ if (packet.getSlot() == this.player.getInventory().selected) { return; } // Paper - don't fire itemheldevent when there wasn't a slot change
|
||
|
|
PlayerItemHeldEvent event = new PlayerItemHeldEvent(this.getCraftPlayer(), this.player.getInventory().selected, packet.getSlot());
|
||
|
|
this.cserver.getPluginManager().callEvent(event);
|
||
|
|
if (event.isCancelled()) {
|