Merge branch 'refs/heads/master' into 1.20.4

# Conflicts:
#	gradle.properties
#	src/main/java/one/oth3r/sit/Sit.java
#	src/main/java/one/oth3r/sit/SitClient.java
#	src/main/java/one/oth3r/sit/packet/CustomPayloads.java
#	src/main/resources/fabric.mod.json
This commit is contained in:
Oth3r 2024-06-13 11:04:01 -05:00
commit 6ea4831a1c
7 changed files with 18 additions and 10 deletions

View file

@ -40,6 +40,7 @@ public class Sit implements ModInitializer {
// copy to not throw errors
PacketBuilder packet = new PacketBuilder(buf.copy());
server.execute(() -> {
LOGGER.info(String.format("Received custom sitting settings from %s.",player.getName().getString()));
Type hashMapToken = new TypeToken<HashMap<String, Object>>() {}.getType();
Gson gson = new GsonBuilder().disableHtmlEscaping().create();
playerSettings.put(player,gson.fromJson(packet.getMessage(),hashMapToken));