2021-06-15 02:59:31 +00:00
|
|
|
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
|
2022-06-03 04:26:56 +00:00
|
|
|
index 7f73b6b63edefcf7fd4f5c7f15558af8b926f24e..ad7bf4468956a840c39b3a52a115501b5479d192 100644
|
2021-06-15 02:59:31 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
|
|
|
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
2022-06-02 01:56:24 +00:00
|
|
|
@@ -1964,6 +1964,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
|
2021-06-15 02:59:31 +00:00
|
|
|
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()) {
|
