Skip to content

Fix MC-28289, players should reset attack strength immediately after changing item in main hand #13179

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix MC-28289, players should reset attack strength immediately after changing item in main hand #13179

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
db87bc6
Update ServerGamePacketListenerImpl.java.patch
LoliColleen Oct 13, 2025
6b12ecf
Update ServerGamePacketListenerImpl.java.patch
LoliColleen Oct 13, 2025
5c42d86
Update ServerGamePacketListenerImpl.java.patch
LoliColleen Oct 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions ...rver/patches/sources/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1403,7 +1403,7 @@
throw new IllegalArgumentException("Expected packet sequence nr >= 0");
} else {
this.ackBlockChangesUpTo = Math.max(sequence, this.ackBlockChangesUpTo);
@@ -1381,20 +_,38 @@
@@ -1381,20 +_,43 @@
@Override
public void handleSetCarriedItem(ServerboundSetCarriedItemPacket packet) {
PacketUtils.ensureRunningOnSameThread(packet, this, this.player.level());
Expand All @@ -1424,7 +1424,12 @@

this.player.getInventory().setSelectedSlot(packet.getSlot());
this.player.resetLastActionTime();
+ if (io.papermc.paper.configuration.GlobalConfiguration.get().unsupportedSettings.updateEquipmentOnPlayerActions) this.player.detectEquipmentUpdates(); // Paper - Force update attributes.
+ // Paper start - Force update attributes.
+ if (io.papermc.paper.configuration.GlobalConfiguration.get().unsupportedSettings.updateEquipmentOnPlayerActions) {
+ this.player.detectEquipmentUpdates();
+ this.player.resetAttackStrengthTicker(); // Paper - Fix MC-28289, players should reset attack strength immediately after changing item in main hand
+ }
+ // Paper end - Force update attributes.
} else {
LOGGER.warn("{} tried to set an invalid carried item", this.player.getPlainTextName());
+ this.disconnect(Component.literal("Invalid hotbar selection (Hacking?)"), org.bukkit.event.player.PlayerKickEvent.Cause.ILLEGAL_ACTION); // CraftBukkit // Paper - kick event cause
Expand Down