SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix client visual desync if cooldown events are cancelled (#11892)

Browse Source
This commit is contained in:
Pedro
2025-01-12 18:56:11 -03:00
committed by GitHub
parent 2ea6aee343
commit ad74b673fa
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
paper-server/patches/sources/net/minecraft/world/item/ServerItemCooldowns.java.patch
View File

@ -1,10 +1,18 @@
--- a/net/minecraft/world/item/ServerItemCooldowns.java --- a/net/minecraft/world/item/ServerItemCooldowns.java
+++ b/net/minecraft/world/item/ServerItemCooldowns.java +++ b/net/minecraft/world/item/ServerItemCooldowns.java
@@ -11,6 +_,39 @@ @@ -11,6 +_,50 @@
this.player = player; this.player = player;
} }
+ // Paper start - Add PlayerItemCooldownEvent + // 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 + @Override
+ public void addCooldown(ItemStack item, int duration) { + public void addCooldown(ItemStack item, int duration) {
+ final ResourceLocation cooldownGroup = this.getCooldownGroup(item); + final ResourceLocation cooldownGroup = this.getCooldownGroup(item);
@ -15,7 +23,9 @@
+ duration + duration
+ ); + );
+ if (event.callEvent()) { + 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 + duration
+ ); + );
+ if (!event.callEvent()) { + if (!event.callEvent()) {
+ this.player.connection.send(new ClientboundCooldownPacket(groupId, this.getCurrentCooldown(groupId)));
+ return; + return;
+ } + }
+ +