Merge branch 'ver/1.21.6' into ver/1.21.7

This commit is contained in:
granny
2025-06-30 12:19:30 -07:00
8 changed files with 66 additions and 29 deletions

View File

@@ -222,6 +222,15 @@
packet.dispatch(
new ServerboundInteractPacket.Handler() {
private void performInteraction(InteractionHand hand, ServerGamePacketListenerImpl.EntityInteraction entityInteraction, PlayerInteractEntityEvent event) { // CraftBukkit
@@ -3536,7 +_,7 @@
@Override
public void handleChangeGameMode(ServerboundChangeGameModePacket packet) {
PacketUtils.ensureRunningOnSameThread(packet, this, this.player.level());
- if (!this.player.hasPermissions(2)) {
+ if (!this.player.hasPermissions(2) && !player.getBukkitEntity().hasPermission("purpur.debug.f3n")) { // Purpur - Add permission for F3+N debug
LOGGER.warn(
"Player {} tried to change game mode to {} without required permissions",
this.player.getGameProfile().getName(),
@@ -3747,6 +_,12 @@
readChannelIdentifier(data, startIndex, data.length, registerChannel);
return;