From 35d1b7f24bcfb567614cb1ae69188df0c0c68b50 Mon Sep 17 00:00:00 2001 From: Jonas Herzig Date: Wed, 10 Aug 2022 13:47:08 +0200 Subject: [PATCH 1/3] Fix game crashing if client disconnects from replay during jump --- src/main/java/com/replaymod/replay/ReplayHandler.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/java/com/replaymod/replay/ReplayHandler.java b/src/main/java/com/replaymod/replay/ReplayHandler.java index 99e90c36..8967aae4 100644 --- a/src/main/java/com/replaymod/replay/ReplayHandler.java +++ b/src/main/java/com/replaymod/replay/ReplayHandler.java @@ -704,6 +704,13 @@ public class ReplayHandler { //#else //$$ .processReceivedPackets(); //#endif + + // If the packets we just sent somehow caused the client to disconnect, then the above connection tick + // call will have unloaded the world, and we'll have to abort what we were doing. + if (mc.world == null) { + return; + } + for (Entity entity : mc.world.getEntities()) { skipTeleportInterpolation(entity); entity.lastRenderX = entity.prevX = entity.getX(); From 06f1e0c36cdb4c02639d847c8d7ac5699d8b394c Mon Sep 17 00:00:00 2001 From: Jonas Herzig Date: Wed, 10 Aug 2022 13:33:27 +0200 Subject: [PATCH 2/3] Fix chat message validation failure when Show Chat is off on 1.19.1+ --- src/main/java/com/replaymod/replay/FullReplaySender.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/replaymod/replay/FullReplaySender.java b/src/main/java/com/replaymod/replay/FullReplaySender.java index fd41e6e2..595e264c 100644 --- a/src/main/java/com/replaymod/replay/FullReplaySender.java +++ b/src/main/java/com/replaymod/replay/FullReplaySender.java @@ -57,6 +57,10 @@ import net.minecraft.util.math.Vec3d; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; +//#if MC>=11901 +//$$ import net.minecraft.network.packet.s2c.play.MessageHeaderS2CPacket; +//#endif + //#if MC>=11900 //$$ import net.minecraft.network.packet.s2c.play.ChatMessageS2CPacket; //#else @@ -864,7 +868,9 @@ public class FullReplaySender extends ChannelDuplexHandler implements ReplaySend } } - //#if MC>=11900 + //#if MC>=11901 + //$$ if (p instanceof GameMessageS2CPacket || p instanceof ChatMessageS2CPacket || p instanceof MessageHeaderS2CPacket) { + //#elseif MC>=11900 //$$ if (p instanceof GameMessageS2CPacket || p instanceof ChatMessageS2CPacket) { //#else if (p instanceof GameMessageS2CPacket) { From cce65ec76df4e17481070afc05cf32d8b1747e98 Mon Sep 17 00:00:00 2001 From: Jonas Herzig Date: Wed, 10 Aug 2022 14:09:23 +0200 Subject: [PATCH 3/3] Ignore expired player public keys during replay These would otherwise fail to be initialized and cause the game to disconnect itself on the first chat message from the corresponding player. --- .../mixin/Mixin_AllowExpiredPlayerKeys.java | 1 + .../resources/mixins.replay.replaymod.json | 3 +++ .../mixin/Mixin_AllowExpiredPlayerKeys.java | 18 ++++++++++++++++++ 3 files changed, 22 insertions(+) create mode 100644 src/main/java/com/replaymod/replay/mixin/Mixin_AllowExpiredPlayerKeys.java create mode 100644 versions/1.19/src/main/java/com/replaymod/replay/mixin/Mixin_AllowExpiredPlayerKeys.java diff --git a/src/main/java/com/replaymod/replay/mixin/Mixin_AllowExpiredPlayerKeys.java b/src/main/java/com/replaymod/replay/mixin/Mixin_AllowExpiredPlayerKeys.java new file mode 100644 index 00000000..be37d3e2 --- /dev/null +++ b/src/main/java/com/replaymod/replay/mixin/Mixin_AllowExpiredPlayerKeys.java @@ -0,0 +1 @@ +// 1.19+ only diff --git a/src/main/resources/mixins.replay.replaymod.json b/src/main/resources/mixins.replay.replaymod.json index 02e6fe65..bdd258a6 100644 --- a/src/main/resources/mixins.replay.replaymod.json +++ b/src/main/resources/mixins.replay.replaymod.json @@ -10,6 +10,9 @@ "world_border.Mixin_UseReplayTime_ForMovement", "world_border.Mixin_UseReplayTime_ForTexture", "Mixin_FixNPCSkinCaching", + //#if MC>=11900 + //$$ "Mixin_AllowExpiredPlayerKeys", + //#endif //#if MC>=11800 //$$ "Mixin_FixEntityNotTracking", //#endif diff --git a/versions/1.19/src/main/java/com/replaymod/replay/mixin/Mixin_AllowExpiredPlayerKeys.java b/versions/1.19/src/main/java/com/replaymod/replay/mixin/Mixin_AllowExpiredPlayerKeys.java new file mode 100644 index 00000000..f64cbc08 --- /dev/null +++ b/versions/1.19/src/main/java/com/replaymod/replay/mixin/Mixin_AllowExpiredPlayerKeys.java @@ -0,0 +1,18 @@ +package com.replaymod.replay.mixin; + +import com.replaymod.replay.ReplayModReplay; +import net.minecraft.network.encryption.PlayerPublicKey; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +@Mixin(PlayerPublicKey.PublicKeyData.class) +public abstract class Mixin_AllowExpiredPlayerKeys { + @Inject(method = "isExpired", at = @At("HEAD"), cancellable = true) + private void neverExpireWhenInReplay(CallbackInfoReturnable ci) { + if (ReplayModReplay.instance.getReplayHandler() != null) { + ci.setReturnValue(false); + } + } +}