Don't cache PacketStatusResponse

This commit is contained in:
BoomEaro 2022-06-10 13:00:01 +03:00
parent 32ea23591f
commit 1da0c8bc2c
3 changed files with 4 additions and 4 deletions

View File

@ -25,6 +25,7 @@ import ru.nanit.limbo.protocol.packets.login.PacketLoginPluginResponse;
import ru.nanit.limbo.protocol.packets.login.PacketLoginStart; import ru.nanit.limbo.protocol.packets.login.PacketLoginStart;
import ru.nanit.limbo.protocol.packets.status.PacketStatusPing; import ru.nanit.limbo.protocol.packets.status.PacketStatusPing;
import ru.nanit.limbo.protocol.packets.status.PacketStatusRequest; import ru.nanit.limbo.protocol.packets.status.PacketStatusRequest;
import ru.nanit.limbo.protocol.packets.status.PacketStatusResponse;
import ru.nanit.limbo.server.LimboServer; import ru.nanit.limbo.server.LimboServer;
import ru.nanit.limbo.server.Logger; import ru.nanit.limbo.server.Logger;
import ru.nanit.limbo.util.UuidUtil; import ru.nanit.limbo.util.UuidUtil;
@ -63,7 +64,7 @@ public class PacketHandler {
} }
public void handle(ClientConnection conn, PacketStatusRequest packet) { public void handle(ClientConnection conn, PacketStatusRequest packet) {
conn.sendPacket(PacketSnapshots.PACKET_STATUS_RESPONSE); conn.sendPacket(new PacketStatusResponse(server));
} }
public void handle(ClientConnection conn, PacketStatusPing packet) { public void handle(ClientConnection conn, PacketStatusPing packet) {

View File

@ -21,7 +21,6 @@ import ru.nanit.limbo.LimboConstants;
import ru.nanit.limbo.protocol.PacketSnapshot; import ru.nanit.limbo.protocol.PacketSnapshot;
import ru.nanit.limbo.protocol.packets.login.PacketLoginSuccess; import ru.nanit.limbo.protocol.packets.login.PacketLoginSuccess;
import ru.nanit.limbo.protocol.packets.play.*; import ru.nanit.limbo.protocol.packets.play.*;
import ru.nanit.limbo.protocol.packets.status.PacketStatusResponse;
import ru.nanit.limbo.server.LimboServer; import ru.nanit.limbo.server.LimboServer;
import ru.nanit.limbo.server.data.Title; import ru.nanit.limbo.server.data.Title;
import ru.nanit.limbo.util.UuidUtil; import ru.nanit.limbo.util.UuidUtil;
@ -32,7 +31,6 @@ import java.util.concurrent.ThreadLocalRandom;
public final class PacketSnapshots { public final class PacketSnapshots {
public static PacketSnapshot PACKET_STATUS_RESPONSE;
public static PacketSnapshot PACKET_LOGIN_SUCCESS; public static PacketSnapshot PACKET_LOGIN_SUCCESS;
public static PacketSnapshot PACKET_JOIN_GAME; public static PacketSnapshot PACKET_JOIN_GAME;
public static PacketSnapshot PACKET_PLUGIN_MESSAGE; public static PacketSnapshot PACKET_PLUGIN_MESSAGE;
@ -101,7 +99,6 @@ public final class PacketSnapshots {
info.setGameMode(server.getConfig().getGameMode()); info.setGameMode(server.getConfig().getGameMode());
info.setUuid(uuid); info.setUuid(uuid);
PACKET_STATUS_RESPONSE = PacketSnapshot.of(new PacketStatusResponse(server));
PACKET_LOGIN_SUCCESS = PacketSnapshot.of(loginSuccess); PACKET_LOGIN_SUCCESS = PacketSnapshot.of(loginSuccess);
PACKET_JOIN_GAME = PacketSnapshot.of(joinGame); PACKET_JOIN_GAME = PacketSnapshot.of(joinGame);
PACKET_PLAYER_ABILITIES = PacketSnapshot.of(playerAbilities); PACKET_PLAYER_ABILITIES = PacketSnapshot.of(playerAbilities);

View File

@ -45,6 +45,8 @@ public class PacketSnapshot implements PacketOut {
Map<Integer, Version> hashes = new HashMap<>(); Map<Integer, Version> hashes = new HashMap<>();
for (Version version : Version.values()) { for (Version version : Version.values()) {
if (version.equals(Version.UNDEFINED)) continue;
ByteMessage encodedMessage = ByteMessage.create(); ByteMessage encodedMessage = ByteMessage.create();
packet.encode(encodedMessage, version); packet.encode(encodedMessage, version);