DIvan2000/ReplayModCinematic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix LoginHelloS2CPacket being recorded on some servers

Browse Source
This commit is contained in:
Jonas Herzig
2024-11-03 15:03:33 +01:00
parent 17d87faa34
commit 14229ef1fe
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/replaymod/recording/packet/PacketListener.java
View File

@@ -31,6 +31,7 @@ import io.netty.channel.ChannelPromise;
import io.netty.util.AttributeKey; import io.netty.util.AttributeKey;
import net.minecraft.client.MinecraftClient; import net.minecraft.client.MinecraftClient;
import net.minecraft.network.ClientConnection; import net.minecraft.network.ClientConnection;
import net.minecraft.network.packet.s2c.login.LoginHelloS2CPacket;
import net.minecraft.network.packet.s2c.play.CustomPayloadS2CPacket; import net.minecraft.network.packet.s2c.play.CustomPayloadS2CPacket;
import net.minecraft.network.packet.s2c.play.DisconnectS2CPacket; import net.minecraft.network.packet.s2c.play.DisconnectS2CPacket;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
@@ -489,6 +490,10 @@ public class PacketListener extends ChannelInboundHandlerAdapter {
@Override @Override
public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception { public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
if (msg instanceof LoginHelloS2CPacket) {
super.channelRead(ctx, msg);
return;
}
if (msg instanceof LoginCompressionS2CPacket) { if (msg instanceof LoginCompressionS2CPacket) {
super.channelRead(ctx, msg); super.channelRead(ctx, msg);
return; return;

2
src/main/java/com/replaymod/replay/FullReplaySender.java
View File

@@ -29,6 +29,7 @@ import net.minecraft.client.world.ClientWorld;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.network.Packet; import net.minecraft.network.Packet;
import net.minecraft.network.packet.s2c.login.LoginHelloS2CPacket;
import net.minecraft.network.packet.s2c.play.GameMessageS2CPacket; import net.minecraft.network.packet.s2c.play.GameMessageS2CPacket;
import net.minecraft.network.packet.s2c.play.CustomPayloadS2CPacket; import net.minecraft.network.packet.s2c.play.CustomPayloadS2CPacket;
import net.minecraft.network.packet.s2c.play.DisconnectS2CPacket; import net.minecraft.network.packet.s2c.play.DisconnectS2CPacket;
@@ -170,6 +171,7 @@ public class FullReplaySender extends ChannelInboundHandlerAdapter implements Re
* These packets are ignored completely during replay. * These packets are ignored completely during replay.
*/ */
private static final List<Class> BAD_PACKETS = Arrays.<Class>asList( private static final List<Class> BAD_PACKETS = Arrays.<Class>asList(
LoginHelloS2CPacket.class, // workaround for an issue where ReplayMod prior to 2.6.20 would record these
//#if MC>=11404 //#if MC>=11404
PlayerActionResponseS2CPacket.class, PlayerActionResponseS2CPacket.class,
//#endif //#endif