diff --git a/build.gradle.kts b/build.gradle.kts index b0960dd..23b4a80 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,7 +2,7 @@ plugins { java `maven-publish` id("com.github.johnrengelman.shadow") version "8.1.0" apply false - id("io.papermc.paperweight.patcher") version "1.5.2" + id("io.papermc.paperweight.patcher") version "1.5.3" } val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/" diff --git a/gradle.properties b/gradle.properties index f8fb26b..aa85bff 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=me.totalfreedom.scissors version=1.19.4-R0.1-SNAPSHOT mcVersion=1.19.4 -paperRef=32875b429a0ad9d0b9c8de63f424d2f0fde545e5 +paperRef=bf92f3e4db44d17dab7411b0a5474a6b2fabc3b5 org.gradle.caching=true org.gradle.parallel=true diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index fc10b60..bdc9a83 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/patches/server/0022-Validate-coordinates-before-attempting-to-get-block-.patch b/patches/server/0022-Validate-coordinates-before-attempting-to-get-block-.patch index 03da6aa..f9a889f 100644 --- a/patches/server/0022-Validate-coordinates-before-attempting-to-get-block-.patch +++ b/patches/server/0022-Validate-coordinates-before-attempting-to-get-block-.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Validate coordinates before attempting to get block entities diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 2d8488b9aa088b6d5f0c7e557b8ad0b29bc4cd88..68fe0d4142a468ea4cbbb79573b02ab8cd0ae823 100644 +index d587b2c4e39bce7e098aa9fab361230f72770658..7d0f736f8ca9a50961b9d7ebfb86d373c6d6f060 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1912,6 +1912,18 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @@ -28,7 +28,7 @@ index 2d8488b9aa088b6d5f0c7e557b8ad0b29bc4cd88..68fe0d4142a468ea4cbbb79573b02ab8 @Override public void handleUseItemOn(ServerboundUseItemOnPacket packet) { PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel()); -@@ -3328,17 +3340,24 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -3329,17 +3341,24 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic if (!itemstack.isEmpty() && nbttagcompound != null && nbttagcompound.contains("x") && nbttagcompound.contains("y") && nbttagcompound.contains("z") && this.player.getBukkitEntity().hasPermission("minecraft.nbt.copy")) { // Spigot BlockPos blockposition = BlockEntity.getPosFromTag(nbttagcompound); diff --git a/patches/server/0032-Prevent-invalid-container-events.patch b/patches/server/0032-Prevent-invalid-container-events.patch index 1a38858..bbaa413 100644 --- a/patches/server/0032-Prevent-invalid-container-events.patch +++ b/patches/server/0032-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 b4e49a37b0d815a9a3e321ec5c8f7196a5e3a80d..98ad7153e2d8a202938815beae9883f8dc78b471 100644 +index 18df58a75c76078f289a3884650edef382f196b5..4eec243172d52e8956a9c2c1bff3e3145acce736 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -30,6 +30,8 @@ import java.util.function.UnaryOperator; @@ -17,7 +17,7 @@ index b4e49a37b0d815a9a3e321ec5c8f7196a5e3a80d..98ad7153e2d8a202938815beae9883f8 import net.minecraft.ChatFormatting; import net.minecraft.CrashReport; import net.minecraft.CrashReportCategory; -@@ -2970,6 +2972,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2971,6 +2973,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic public void handleContainerClick(ServerboundContainerClickPacket packet) { PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel()); if (this.player.isImmobile()) return; // CraftBukkit @@ -25,7 +25,7 @@ index b4e49a37b0d815a9a3e321ec5c8f7196a5e3a80d..98ad7153e2d8a202938815beae9883f8 this.player.resetLastActionTime(); if (this.player.containerMenu.containerId == packet.getContainerId() && this.player.containerMenu.stillValid(this.player)) { // CraftBukkit boolean cancelled = this.player.isSpectator(); // CraftBukkit - see below if -@@ -2991,6 +2994,18 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2992,6 +2995,18 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic return; } diff --git a/patches/server/0037-Add-Scissors-configuration-file-command.patch b/patches/server/0037-Add-Scissors-configuration-file-command.patch index 7decb1a..a411ebc 100644 --- a/patches/server/0037-Add-Scissors-configuration-file-command.patch +++ b/patches/server/0037-Add-Scissors-configuration-file-command.patch @@ -486,7 +486,7 @@ index a7e133f3495e9132a5fdae2c24f225e7b026295a..16f0daad2456ce23f8d73389f62aac9f this.setFlightAllowed(dedicatedserverproperties.allowFlight); this.setMotd(dedicatedserverproperties.motd); diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index c15c5855dca11cd69f316c42783d32b800a93bd7..1ec1cc90c7e698036f6ae446f0dab97f03ebb064 100644 +index c21e15ec8f87defe4c724dfe2659779b876fba27..598b1754c51a62975aaa98aba45aca149e8812bf 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 @@ @@ -496,7 +496,7 @@ index c15c5855dca11cd69f316c42783d32b800a93bd7..1ec1cc90c7e698036f6ae446f0dab97f import me.totalfreedom.scissors.event.player.SpectatorTeleportEvent; import com.google.common.collect.Lists; import com.google.common.primitives.Floats; -@@ -2360,6 +2361,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2361,6 +2362,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic Optional optional = this.lastSeenMessages.applyUpdate(acknowledgment); if (optional.isEmpty()) { @@ -509,7 +509,7 @@ index c15c5855dca11cd69f316c42783d32b800a93bd7..1ec1cc90c7e698036f6ae446f0dab97f 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 } -@@ -2592,11 +2599,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2593,11 +2600,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @Override public void handleChatAck(ServerboundChatAckPacket packet) { LastSeenMessagesValidator lastseenmessagesvalidator = this.lastSeenMessages;