Skip to content

Allow ServerboundChangeGameModePacket if player has /gamemode permissions #13507

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
Warriorrrr wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Allow ServerboundChangeGameModePacket if player has /gamemode permissions #13507

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 9 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 @@ -2509,7 +2509,7 @@
if (this.player.isModelPartShown(PlayerModelPart.HAT) != isModelPartShown) {
this.server.getPlayerList().broadcastAll(new ClientboundPlayerInfoUpdatePacket(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_HAT, this.player));
}
@@ -2003,7 +_,7 @@
@@ -2003,21 +_,21 @@
packet.difficulty().getDisplayName()
);
} else {
Expand All @@ -2518,7 +2518,14 @@
}
}

@@ -2017,7 +_,7 @@
@Override
public void handleChangeGameMode(ServerboundChangeGameModePacket packet) {
PacketUtils.ensureRunningOnSameThread(packet, this, this.player.level());
- if (!GameModeCommand.PERMISSION_CHECK.check(this.player.permissions())) {
+ if (!GameModeCommand.PERMISSION_CHECK.check(this.player.permissions()) && !this.player.getBukkitEntity().hasPermission("minecraft.command.gamemode")) { // Paper - add permission check
LOGGER.warn(
"Player {} tried to change game mode to {} without required permissions",
this.player.getGameProfile().name(),
packet.mode().getShortDisplayName().getString()
);
} else {
Expand Down
Loading