From dce994005e3bec801626441a0562a25880177166 Mon Sep 17 00:00:00 2001 From: Telesphoreo Date: Sun, 6 Aug 2023 16:48:24 -0500 Subject: [PATCH] Update Paper --- gradle.properties | 2 +- patches/api/0003-Add-Scissors-configuration-file.patch | 4 ++-- patches/server/0001-Build-changes.patch | 6 +++--- .../0016-Add-Scissors-configuration-file-command.patch | 10 +++++----- patches/server/0024-Reset-large-tags.patch | 8 ++++---- patches/server/0028-Add-spectator-teleport-event.patch | 4 ++-- .../server/0029-Prevent-invalid-container-events.patch | 4 ++-- ...idate-block-entity-entity-tag-query-positions.patch | 6 +++--- ...nfiguration-option-to-disable-chat-signatures.patch | 10 +++++----- .../server/0044-Implement-command-block-events.patch | 6 +++--- .../server/0049-Fix-packet-related-lag-exploits.patch | 10 +++++----- 11 files changed, 35 insertions(+), 35 deletions(-) diff --git a/gradle.properties b/gradle.properties index 55a517c..58e4314 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=me.totalfreedom.scissors version=1.20.1-R0.1-SNAPSHOT mcVersion=1.20.1 -paperRef=69a801305d3148d49672401e83905d95bfc950ec +paperRef=d6d2b6f4e51b24867b609cf747ac6d8c6345c449 org.gradle.caching=true org.gradle.parallel=true diff --git a/patches/api/0003-Add-Scissors-configuration-file.patch b/patches/api/0003-Add-Scissors-configuration-file.patch index 200be6c..931bda8 100644 --- a/patches/api/0003-Add-Scissors-configuration-file.patch +++ b/patches/api/0003-Add-Scissors-configuration-file.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add Scissors configuration file diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 6b72eccdcb6f75534a4267a1dd0a4cc2f39e917b..951d157785875805f8c95abc589df5607905001e 100644 +index 68206cf0178c26c0f528a1e14a5fb4e9ad410369..dc8621c4b020bfe896863fe05122f55e3fff7c62 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -2030,6 +2030,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -2081,6 +2081,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi } // Paper end diff --git a/patches/server/0001-Build-changes.patch b/patches/server/0001-Build-changes.patch index 04fe5b3..14b15fc 100644 --- a/patches/server/0001-Build-changes.patch +++ b/patches/server/0001-Build-changes.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Build changes diff --git a/build.gradle.kts b/build.gradle.kts -index 57f2c414dbfe127c193002fbc8eeb22e94e9cb55..ee62a53db6b16a5845c315b6de842cfbd96f584a 100644 +index fb98936bb8a5488db75d676c5bcb4060597fbbf8..904bf48288e0865db9bbe8d2ca183b8385f73407 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -13,8 +13,12 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) { @@ -108,10 +108,10 @@ index 3238cbcba567b1242c77e41f6b6f19a8d157fb4e..dd4dc6b29e37a4db459779fa8d4adc23 public SystemReport fillSystemReport(SystemReport details) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index a05c1bc8874ef5e380544a6a344c848e37da49c4..304a4cf393cbb08adebb20dc1ae4b834cfded223 100644 +index 54f27d91f941235a99e341ed84531ad7f0840728..3758aab606498e7b5fe322bb49ac0731815269e7 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -264,7 +264,7 @@ import javax.annotation.Nullable; // Paper +@@ -265,7 +265,7 @@ import javax.annotation.Nullable; // Paper import javax.annotation.Nonnull; // Paper public final class CraftServer implements Server { diff --git a/patches/server/0016-Add-Scissors-configuration-file-command.patch b/patches/server/0016-Add-Scissors-configuration-file-command.patch index b8149f1..c5ec8db 100644 --- a/patches/server/0016-Add-Scissors-configuration-file-command.patch +++ b/patches/server/0016-Add-Scissors-configuration-file-command.patch @@ -447,10 +447,10 @@ index 9f422cbeaa52b3e6a0a27af4f8ad4ddb7808483f..bbfb536ddec7f44d2a75d35ab495be26 this.setFlightAllowed(dedicatedserverproperties.allowFlight); this.setMotd(dedicatedserverproperties.motd); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 304a4cf393cbb08adebb20dc1ae4b834cfded223..307383cfa9007be1e85631198dc6f2364a7536bf 100644 +index 3758aab606498e7b5fe322bb49ac0731815269e7..8af5a986337c79580060217e1f5ef343719b1493 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1055,6 +1055,7 @@ public final class CraftServer implements Server { +@@ -1056,6 +1056,7 @@ public final class CraftServer implements Server { } org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot @@ -458,7 +458,7 @@ index 304a4cf393cbb08adebb20dc1ae4b834cfded223..307383cfa9007be1e85631198dc6f236 this.console.paperConfigurations.reloadConfigs(this.console); for (ServerLevel world : this.console.getAllLevels()) { // world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty -@@ -1086,6 +1087,7 @@ public final class CraftServer implements Server { +@@ -1087,6 +1088,7 @@ public final class CraftServer implements Server { this.reloadData(); org.spigotmc.SpigotConfig.registerCommands(); // Spigot io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper @@ -466,7 +466,7 @@ index 304a4cf393cbb08adebb20dc1ae4b834cfded223..307383cfa9007be1e85631198dc6f236 this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*"); this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions"); -@@ -2864,6 +2866,14 @@ public final class CraftServer implements Server { +@@ -2902,6 +2904,14 @@ public final class CraftServer implements Server { return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console); } @@ -482,7 +482,7 @@ index 304a4cf393cbb08adebb20dc1ae4b834cfded223..307383cfa9007be1e85631198dc6f236 public void restart() { org.spigotmc.RestartCommand.restart(); diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 1860fd41becd4edaf2ff2f8737f75eb7f55736d0..35fab225ae1d55666504fc0336025d84b8ed1ae5 100644 +index 344bef62aa1551a6a09c10492cbc26acb63fa105..0e3127f3fffb832571aef3b14085e66289ad76b1 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -180,6 +180,20 @@ public class Main { diff --git a/patches/server/0024-Reset-large-tags.patch b/patches/server/0024-Reset-large-tags.patch index 8055ed2..dffe911 100644 --- a/patches/server/0024-Reset-large-tags.patch +++ b/patches/server/0024-Reset-large-tags.patch @@ -59,7 +59,7 @@ index 4092c7a8c2b0d9d26e6f4d97386735236300d132..04c47cf1a920ae6c356449df801227ee } } diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java -index ae9b821d71d2868ba4eb3c73558fdcd6caf264e3..744c21ddc67ad3172bbc71e000b092a189dfafb8 100644 +index 879cc823d56625867eb73bb621db6a13f40ad81c..e61958a69bbccd08093932cd7fe74139b1054514 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java @@ -21,6 +21,7 @@ import java.util.function.Predicate; @@ -83,7 +83,7 @@ index ae9b821d71d2868ba4eb3c73558fdcd6caf264e3..744c21ddc67ad3172bbc71e000b092a1 this.item = (Item) BuiltInRegistries.ITEM.get(new ResourceLocation(nbttagcompound.getString("id"))); this.count = nbttagcompound.getByte("Count"); if (nbttagcompound.contains("tag", 10)) { -@@ -551,7 +558,11 @@ public final class ItemStack { +@@ -555,7 +562,11 @@ public final class ItemStack { nbt.putString("id", minecraftkey == null ? "minecraft:air" : minecraftkey.toString()); nbt.putByte("Count", (byte) this.count); if (this.tag != null) { @@ -96,7 +96,7 @@ index ae9b821d71d2868ba4eb3c73558fdcd6caf264e3..744c21ddc67ad3172bbc71e000b092a1 } return nbt; -@@ -881,6 +892,7 @@ public final class ItemStack { +@@ -885,6 +896,7 @@ public final class ItemStack { // Paper end public void setTag(@Nullable CompoundTag nbt) { @@ -252,7 +252,7 @@ index 881379681c39230a00b3a1f11cd87498984396c7..d0513b72cdaec3b67b9341d251367b19 } diff --git a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java -index a8a26a0a37a08b6bbeb5a1fde417d6f448d3c79f..45e92e5cb10300de9072997cca06968e2c059083 100644 +index b11f51762ca289d99eaa49e66e31e58595bcea4e..06adfdc61f1064c1ec0db34632a8740fc09a1782 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java @@ -6,6 +6,7 @@ import java.util.function.BooleanSupplier; diff --git a/patches/server/0028-Add-spectator-teleport-event.patch b/patches/server/0028-Add-spectator-teleport-event.patch index 332e1dc..c6de790 100644 --- a/patches/server/0028-Add-spectator-teleport-event.patch +++ b/patches/server/0028-Add-spectator-teleport-event.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add spectator teleport event diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 2a609e43370e68943c580083f7f7d8c9b0972955..af4bbfea9ec461ffddd359b0d39843882cea40eb 100644 +index 75bd92e1d40588d3bc40fa7837943eec9f2062a6..0a6f91bbf3e5a0960a61f2938443810f161065ab 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1,5 +1,6 @@ @@ -15,7 +15,7 @@ index 2a609e43370e68943c580083f7f7d8c9b0972955..af4bbfea9ec461ffddd359b0d3984388 import com.google.common.collect.Lists; import com.google.common.primitives.Floats; import com.mojang.brigadier.ParseResults; -@@ -2058,6 +2059,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2060,6 +2061,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic Entity entity = packet.getEntity(worldserver); if (entity != null) { diff --git a/patches/server/0029-Prevent-invalid-container-events.patch b/patches/server/0029-Prevent-invalid-container-events.patch index 8341ae4..7e2162e 100644 --- a/patches/server/0029-Prevent-invalid-container-events.patch +++ b/patches/server/0029-Prevent-invalid-container-events.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Prevent invalid container events diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index c2e1157e136553c63fa7b7bd194855705183dc51..b2eadb4c76dfd3f86159168935479e79a83bb1cf 100644 +index 0a6f91bbf3e5a0960a61f2938443810f161065ab..ac0a79d48b721e00690dcdfe02fa3c631a5936f8 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -30,6 +30,7 @@ import java.util.function.UnaryOperator; @@ -16,7 +16,7 @@ index c2e1157e136553c63fa7b7bd194855705183dc51..b2eadb4c76dfd3f86159168935479e79 import net.minecraft.ChatFormatting; import net.minecraft.CrashReport; import net.minecraft.CrashReportCategory; -@@ -3005,6 +3006,18 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -3004,6 +3005,18 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic return; } diff --git a/patches/server/0031-Validate-block-entity-entity-tag-query-positions.patch b/patches/server/0031-Validate-block-entity-entity-tag-query-positions.patch index c009fe5..78d47d6 100644 --- a/patches/server/0031-Validate-block-entity-entity-tag-query-positions.patch +++ b/patches/server/0031-Validate-block-entity-entity-tag-query-positions.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Validate block entity/entity tag query positions diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 26a92bcb1c6577b6982fe723fc65f64adddbce4f..52fb4163e8d7e0b9d859ac5d2827f8695f6b867f 100644 +index ac0a79d48b721e00690dcdfe02fa3c631a5936f8..5903534f1245b0aaeff0f1ea29e63bb224877787 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -1362,7 +1362,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -1364,7 +1364,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic if (this.player.hasPermissions(2)) { Entity entity = this.player.level().getEntity(packet.getEntityId()); @@ -17,7 +17,7 @@ index 26a92bcb1c6577b6982fe723fc65f64adddbce4f..52fb4163e8d7e0b9d859ac5d2827f869 CompoundTag nbttagcompound = entity.saveWithoutId(new CompoundTag()); this.player.connection.send(new ClientboundTagQueryPacket(packet.getTransactionId(), nbttagcompound)); -@@ -1374,7 +1374,10 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -1376,7 +1376,10 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @Override public void handleBlockEntityTagQuery(ServerboundBlockEntityTagQuery packet) { PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel()); diff --git a/patches/server/0035-Add-configuration-option-to-disable-chat-signatures.patch b/patches/server/0035-Add-configuration-option-to-disable-chat-signatures.patch index d522053..fb4a965 100644 --- a/patches/server/0035-Add-configuration-option-to-disable-chat-signatures.patch +++ b/patches/server/0035-Add-configuration-option-to-disable-chat-signatures.patch @@ -60,7 +60,7 @@ index c0a80824a0307ea673805015119cc834b268f0dc..9f28f86b1b56ea55ab39f6ac988c1f47 } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 0546d95c88ed9004b4a5aac49203638257f699ee..1c012c9b468cb4ce6a504a6a3cffe304bf926502 100644 +index 5903534f1245b0aaeff0f1ea29e63bb224877787..52fafac90771554661ca4e0640fc1c7ca811bf6b 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1,5 +1,6 @@ @@ -70,7 +70,7 @@ index 0546d95c88ed9004b4a5aac49203638257f699ee..1c012c9b468cb4ce6a504a6a3cffe304 import me.totalfreedom.scissors.event.player.SpectatorTeleportEvent; // Scissors import com.google.common.collect.Lists; import com.google.common.primitives.Floats; -@@ -2313,7 +2314,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2315,7 +2316,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic } private void handleMessageDecodeFailure(SignedMessageChain.DecodeException exception) { @@ -79,7 +79,7 @@ index 0546d95c88ed9004b4a5aac49203638257f699ee..1c012c9b468cb4ce6a504a6a3cffe304 this.disconnect(exception.getComponent(), exception.kickCause); // Paper - kick event causes } else { this.player.sendSystemMessage(exception.getComponent().copy().withStyle(ChatFormatting.RED)); -@@ -2369,6 +2370,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2371,6 +2372,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic Optional optional = this.lastSeenMessages.applyUpdate(acknowledgment); if (optional.isEmpty()) { @@ -87,7 +87,7 @@ index 0546d95c88ed9004b4a5aac49203638257f699ee..1c012c9b468cb4ce6a504a6a3cffe304 ServerGamePacketListenerImpl.LOGGER.warn("Failed to validate message acknowledgements from {}", this.player.getName().getString()); this.disconnect(ServerGamePacketListenerImpl.CHAT_VALIDATION_FAILED, org.bukkit.event.player.PlayerKickEvent.Cause.CHAT_VALIDATION_FAILED); // Paper - kick event causes } -@@ -2604,6 +2606,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2600,6 +2602,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic synchronized (this.lastSeenMessages) { if (!this.lastSeenMessages.applyOffset(packet.offset())) { @@ -95,7 +95,7 @@ index 0546d95c88ed9004b4a5aac49203638257f699ee..1c012c9b468cb4ce6a504a6a3cffe304 ServerGamePacketListenerImpl.LOGGER.warn("Failed to validate message acknowledgements from {}", this.player.getName().getString()); this.disconnect(ServerGamePacketListenerImpl.CHAT_VALIDATION_FAILED, org.bukkit.event.player.PlayerKickEvent.Cause.CHAT_VALIDATION_FAILED); // Paper - kick event causes } -@@ -3614,6 +3617,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -3640,6 +3643,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @Override public void handleChatSessionUpdate(ServerboundChatSessionUpdatePacket packet) { PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel()); diff --git a/patches/server/0044-Implement-command-block-events.patch b/patches/server/0044-Implement-command-block-events.patch index 9ed5684..1625122 100644 --- a/patches/server/0044-Implement-command-block-events.patch +++ b/patches/server/0044-Implement-command-block-events.patch @@ -18,7 +18,7 @@ index c99fc118013cb3d4043638e2001a8297e79ddf9c..cdaa81e1f2167b29ec01cc25e51a8400 private final boolean trackOutput; diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 3c798443b7eb52dd0b66bdb27422f6e198d48c2c..fbc247d364d3cdee94b04b1108c99d2909b1773a 100644 +index 52fafac90771554661ca4e0640fc1c7ca811bf6b..22e9ad5a55d43c91528c302c02725acb72bc1199 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1,6 +1,8 @@ @@ -47,7 +47,7 @@ index 3c798443b7eb52dd0b66bdb27422f6e198d48c2c..fbc247d364d3cdee94b04b1108c99d29 import org.slf4j.Logger; // CraftBukkit start -@@ -1000,6 +1005,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -1002,6 +1007,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic this.player.level().getChunkAt(blockposition).setBlockEntity(tileentity); } @@ -64,7 +64,7 @@ index 3c798443b7eb52dd0b66bdb27422f6e198d48c2c..fbc247d364d3cdee94b04b1108c99d29 commandblocklistenerabstract.setCommand(s); commandblocklistenerabstract.setTrackOutput(flag); if (!flag) { -@@ -1031,7 +1046,18 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -1033,7 +1048,18 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic BaseCommandBlock commandblocklistenerabstract = packet.getCommandBlock(this.player.level()); if (commandblocklistenerabstract != null) { diff --git a/patches/server/0049-Fix-packet-related-lag-exploits.patch b/patches/server/0049-Fix-packet-related-lag-exploits.patch index 6d33969..c9c8943 100644 --- a/patches/server/0049-Fix-packet-related-lag-exploits.patch +++ b/patches/server/0049-Fix-packet-related-lag-exploits.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Fix packet-related lag exploits diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index e6ca11d556cd284bd9124111ddcec87fa2175a09..c4ba1bd493db96fd894c432aa6b416f3ccd00b3f 100644 +index 22e9ad5a55d43c91528c302c02725acb72bc1199..a6b39b348215db1afb0333575cdd5cee6a4b1c85 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -965,7 +965,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -967,7 +967,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic this.player.sendSystemMessage(Component.translatable("advMode.notEnabled")); } else if (!this.player.canUseGameMasterBlocks() && (!this.player.isCreative() || !this.player.getBukkitEntity().hasPermission("minecraft.commandblock"))) { // Paper - command block permission this.player.sendSystemMessage(Component.translatable("advMode.notAllowed")); @@ -17,7 +17,7 @@ index e6ca11d556cd284bd9124111ddcec87fa2175a09..c4ba1bd493db96fd894c432aa6b416f3 BaseCommandBlock commandblocklistenerabstract = null; CommandBlockEntity tileentitycommand = null; BlockPos blockposition = packet.getPos(); -@@ -1125,7 +1125,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -1127,7 +1127,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @Override public void handleSetStructureBlock(ServerboundSetStructureBlockPacket packet) { PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel()); @@ -26,7 +26,7 @@ index e6ca11d556cd284bd9124111ddcec87fa2175a09..c4ba1bd493db96fd894c432aa6b416f3 BlockPos blockposition = packet.getPos(); BlockState iblockdata = this.player.level().getBlockState(blockposition); BlockEntity tileentity = this.player.level().getBlockEntity(blockposition); -@@ -1183,7 +1183,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -1185,7 +1185,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @Override public void handleSetJigsawBlock(ServerboundSetJigsawBlockPacket packet) { PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel()); @@ -35,7 +35,7 @@ index e6ca11d556cd284bd9124111ddcec87fa2175a09..c4ba1bd493db96fd894c432aa6b416f3 BlockPos blockposition = packet.getPos(); BlockState iblockdata = this.player.level().getBlockState(blockposition); BlockEntity tileentity = this.player.level().getBlockEntity(blockposition); -@@ -1206,7 +1206,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -1208,7 +1208,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @Override public void handleJigsawGenerate(ServerboundJigsawGeneratePacket packet) { PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel());