1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-18 23:23:19 +01:00

Fix client visual desync if cooldown events are cancelled ()

This commit is contained in:
Pedro 2025-01-12 18:56:11 -03:00 committed by GitHub
parent 2ea6aee343
commit ad74b673fa
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -1,10 +1,18 @@
--- a/net/minecraft/world/item/ServerItemCooldowns.java
+++ b/net/minecraft/world/item/ServerItemCooldowns.java
@@ -11,6 +_,39 @@
@@ -11,6 +_,50 @@
this.player = player;
}
+ // Paper start - Add PlayerItemCooldownEvent
+ private int getCurrentCooldown(final ResourceLocation groupId) {
+ final net.minecraft.world.item.ItemCooldowns.CooldownInstance cooldownInstance = this.cooldowns.get(groupId);
+ if (cooldownInstance == null) {
+ return 0;
+ }
+ return Math.max(0, cooldownInstance.endTime() - this.tickCount);
+ }
+
+ @Override
+ public void addCooldown(ItemStack item, int duration) {
+ final ResourceLocation cooldownGroup = this.getCooldownGroup(item);
@ -15,7 +23,9 @@
+ duration
+ );
+ if (event.callEvent()) {
+ super.addCooldown(cooldownGroup, event.getCooldown(), false);
+ this.addCooldown(cooldownGroup, event.getCooldown(), false);
+ } else {
+ this.player.connection.send(new ClientboundCooldownPacket(cooldownGroup, this.getCurrentCooldown(cooldownGroup)));
+ }
+ }
+
@ -28,6 +38,7 @@
+ duration
+ );
+ if (!event.callEvent()) {
+ this.player.connection.send(new ClientboundCooldownPacket(groupId, this.getCurrentCooldown(groupId)));
+ return;
+ }
+