From a928a00e343ee1d8fc2f15f27fc2c15203ef8d66 Mon Sep 17 00:00:00 2001 From: Telesphoreo Date: Tue, 8 Aug 2023 16:12:26 -0500 Subject: [PATCH] Update Paper --- gradle.properties | 2 +- patches/server/0028-Add-spectator-teleport-event.patch | 4 ++-- .../server/0029-Prevent-invalid-container-events.patch | 4 ++-- ...nfiguration-option-to-disable-chat-signatures.patch | 10 +++++----- .../0036-Patch-invalid-entity-rotation-log-spam.patch | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/gradle.properties b/gradle.properties index 58e4314..ae81501 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=d6d2b6f4e51b24867b609cf747ac6d8c6345c449 +paperRef=408a9050baf29341b877a7bebff0939442d818d0 org.gradle.caching=true org.gradle.parallel=true diff --git a/patches/server/0028-Add-spectator-teleport-event.patch b/patches/server/0028-Add-spectator-teleport-event.patch index c6de790..b414d78 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 75bd92e1d40588d3bc40fa7837943eec9f2062a6..0a6f91bbf3e5a0960a61f2938443810f161065ab 100644 +index 80e050603e36134754136a8ee2bd14624f976e91..a25b87311883c2fc2e9bd3707c79b88cbab0c3d9 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 75bd92e1d40588d3bc40fa7837943eec9f2062a6..0a6f91bbf3e5a0960a61f2938443810f import com.google.common.collect.Lists; import com.google.common.primitives.Floats; import com.mojang.brigadier.ParseResults; -@@ -2060,6 +2061,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2101,6 +2102,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 7e2162e..82f3cd1 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 0a6f91bbf3e5a0960a61f2938443810f161065ab..ac0a79d48b721e00690dcdfe02fa3c631a5936f8 100644 +index a25b87311883c2fc2e9bd3707c79b88cbab0c3d9..d40399fd67bd95f58cc1a99c93feb55decd5601a 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 0a6f91bbf3e5a0960a61f2938443810f161065ab..ac0a79d48b721e00690dcdfe02fa3c63 import net.minecraft.ChatFormatting; import net.minecraft.CrashReport; import net.minecraft.CrashReportCategory; -@@ -3004,6 +3005,18 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -3045,6 +3046,18 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic return; } 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 fb4a965..56ba4c6 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 5903534f1245b0aaeff0f1ea29e63bb224877787..52fafac90771554661ca4e0640fc1c7ca811bf6b 100644 +index f240918e38c09b303f202d626f152fc3d0d9dc06..0148820d45a62c58545b1aac84c69e53ff6fc476 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 5903534f1245b0aaeff0f1ea29e63bb224877787..52fafac90771554661ca4e0640fc1c7c import me.totalfreedom.scissors.event.player.SpectatorTeleportEvent; // Scissors import com.google.common.collect.Lists; import com.google.common.primitives.Floats; -@@ -2315,7 +2316,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2356,7 +2357,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic } private void handleMessageDecodeFailure(SignedMessageChain.DecodeException exception) { @@ -79,7 +79,7 @@ index 5903534f1245b0aaeff0f1ea29e63bb224877787..52fafac90771554661ca4e0640fc1c7c this.disconnect(exception.getComponent(), exception.kickCause); // Paper - kick event causes } else { this.player.sendSystemMessage(exception.getComponent().copy().withStyle(ChatFormatting.RED)); -@@ -2371,6 +2372,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2412,6 +2413,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic Optional optional = this.lastSeenMessages.applyUpdate(acknowledgment); if (optional.isEmpty()) { @@ -87,7 +87,7 @@ index 5903534f1245b0aaeff0f1ea29e63bb224877787..52fafac90771554661ca4e0640fc1c7c 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 } -@@ -2600,6 +2602,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2641,6 +2643,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic synchronized (this.lastSeenMessages) { if (!this.lastSeenMessages.applyOffset(packet.offset())) { @@ -95,7 +95,7 @@ index 5903534f1245b0aaeff0f1ea29e63bb224877787..52fafac90771554661ca4e0640fc1c7c 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 } -@@ -3640,6 +3643,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -3681,6 +3684,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/0036-Patch-invalid-entity-rotation-log-spam.patch b/patches/server/0036-Patch-invalid-entity-rotation-log-spam.patch index ba6abcf..0a3123d 100644 --- a/patches/server/0036-Patch-invalid-entity-rotation-log-spam.patch +++ b/patches/server/0036-Patch-invalid-entity-rotation-log-spam.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Patch invalid entity rotation log spam diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 1ccf49559e12f46e5324c63d5b0a3329b01c9440..c895da05f711ada4bdf2682e5bb6c78a1100e693 100644 +index afd25ef82b88521925d2b92286ab8fbda9983a0a..1d8c1090cffa7a7442d148b23a981ab10aaec712 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -4622,7 +4622,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -4627,7 +4627,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { public void setXRot(float pitch) { if (!Float.isFinite(pitch)) {