From d5f75e188909bd4441a22b98aa9be761deb6cc0d Mon Sep 17 00:00:00 2001 From: KingRainbow44 Date: Sat, 29 Apr 2023 02:00:13 -0400 Subject: [PATCH] Attempt to correct `PlayerSetPauseReq` this is still broken; further investigation is required --- .../server/packet/recv/HandlerPlayerSetPauseReq.java | 3 +-- .../server/packet/send/PacketPlayerSetPauseRsp.java | 7 +++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerPlayerSetPauseReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerPlayerSetPauseReq.java index 9f831fb2c..73c39f518 100644 --- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerPlayerSetPauseReq.java +++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerPlayerSetPauseReq.java @@ -15,10 +15,9 @@ public class HandlerPlayerSetPauseReq extends PacketHandler { @Override public void handle(GameSession session, byte[] header, byte[] payload) throws Exception { - PacketHead head = PacketHead.parseFrom(header); PlayerSetPauseReq req = PlayerSetPauseReq.parseFrom(payload); - session.send(new PacketPlayerSetPauseRsp(head.getClientSequenceId())); + session.send(new PacketPlayerSetPauseRsp()); session.getPlayer().setPaused(req.getIsPaused()); session.send(new PacketPlayerTimeNotify(session.getPlayer())); diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerSetPauseRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerSetPauseRsp.java index 844c1496e..b09032ed6 100644 --- a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerSetPauseRsp.java +++ b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerSetPauseRsp.java @@ -2,12 +2,15 @@ package emu.grasscutter.server.packet.send; import emu.grasscutter.net.packet.BasePacket; import emu.grasscutter.net.packet.PacketOpcodes; +import emu.grasscutter.net.proto.PlayerSetPauseRspOuterClass.PlayerSetPauseRsp; +import emu.grasscutter.net.proto.RetcodeOuterClass.Retcode; public class PacketPlayerSetPauseRsp extends BasePacket { - public PacketPlayerSetPauseRsp(int clientSequence) { + public PacketPlayerSetPauseRsp() { super(PacketOpcodes.PlayerSetPauseRsp); - this.buildHeader(clientSequence); + this.setData(PlayerSetPauseRsp.newBuilder() + .setRetcode(Retcode.RET_SUCC_VALUE)); } }