From 970d5cfcd209e8f5c31d9a435ce334bc4a4adf9c Mon Sep 17 00:00:00 2001 From: Nanit Date: Fri, 28 Jan 2022 16:07:10 +0200 Subject: [PATCH] Fixed packet snapshot for minimal version --- build.gradle | 2 +- src/main/java/ru/nanit/limbo/protocol/PacketSnapshot.java | 5 +++++ .../limbo/protocol/packets/status/PacketStatusResponse.java | 6 +++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index fa4b6d1..945b356 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ plugins { } group 'ru.nanit' -version '1.4' +version '1.3.2' repositories { mavenCentral() diff --git a/src/main/java/ru/nanit/limbo/protocol/PacketSnapshot.java b/src/main/java/ru/nanit/limbo/protocol/PacketSnapshot.java index d61c0ed..7b02ab0 100644 --- a/src/main/java/ru/nanit/limbo/protocol/PacketSnapshot.java +++ b/src/main/java/ru/nanit/limbo/protocol/PacketSnapshot.java @@ -57,6 +57,7 @@ public class PacketSnapshot implements PacketOut { mappings.put(version, hashed); } else { hashes.put(hash, version); + mappings.put(version, version); versionMessages.put(version, encodedMessage.toByteArray()); } @@ -69,6 +70,10 @@ public class PacketSnapshot implements PacketOut { @Override public void encode(ByteMessage msg, Version version) { Version mapped = mappings.get(version); + + if (mapped == null) + throw new IllegalArgumentException("No mapped version is for " + version); + byte[] message = versionMessages.get(mapped); if (message != null) diff --git a/src/main/java/ru/nanit/limbo/protocol/packets/status/PacketStatusResponse.java b/src/main/java/ru/nanit/limbo/protocol/packets/status/PacketStatusResponse.java index fb7d511..3655af1 100644 --- a/src/main/java/ru/nanit/limbo/protocol/packets/status/PacketStatusResponse.java +++ b/src/main/java/ru/nanit/limbo/protocol/packets/status/PacketStatusResponse.java @@ -42,10 +42,10 @@ public class PacketStatusResponse implements PacketOut { String ver = server.getConfig().getPingData().getVersion(); String desc = server.getConfig().getPingData().getDescription(); - String json = getResponseJson(ver, protocol, - server.getConfig().getMaxPlayers(), server.getConnections().getCount(), desc); - msg.writeString(json); + msg.writeString(getResponseJson(ver, protocol, + server.getConfig().getMaxPlayers(), + server.getConnections().getCount(), desc)); } @Override