Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-01-07 00:48:28 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #399 from Bloepiloepi/item-release-fix

Browse Source 
Use active hand when updating item state
This commit is contained in:
TheMode 2021-08-13 09:30:38 +02:00 committed by GitHub
commit f967f6ac6a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/net/minestom/server/listener/PlayerDiggingListener.java
View File

@ -2,6 +2,7 @@ package net.minestom.server.listener;
import net.minestom.server.entity.GameMode; import net.minestom.server.entity.GameMode;
import net.minestom.server.entity.Player; import net.minestom.server.entity.Player;
import net.minestom.server.entity.metadata.PlayerMeta;
import net.minestom.server.event.EventDispatcher; import net.minestom.server.event.EventDispatcher;
import net.minestom.server.event.item.ItemUpdateStateEvent; import net.minestom.server.event.item.ItemUpdateStateEvent;
import net.minestom.server.event.player.PlayerStartDiggingEvent; import net.minestom.server.event.player.PlayerStartDiggingEvent;
@ -136,14 +137,9 @@ public class PlayerDiggingListener {
} }
} else if (status == ClientPlayerDiggingPacket.Status.UPDATE_ITEM_STATE) { } else if (status == ClientPlayerDiggingPacket.Status.UPDATE_ITEM_STATE) {
Player.Hand hand = null; PlayerMeta meta = player.getEntityMeta();
if (player.isEating()) { if (!meta.isHandActive()) return;
hand = player.getEatingHand(); Player.Hand hand = meta.getActiveHand();
} else if (player.getItemInHand(Player.Hand.OFF).getMaterial().hasState()) {
hand = Player.Hand.OFF;
} else if (player.getItemInHand(Player.Hand.MAIN).getMaterial().hasState()) {
hand = Player.Hand.MAIN;
}
player.refreshEating(null); player.refreshEating(null);
player.triggerStatus((byte) 9); player.triggerStatus((byte) 9);