From add31d1f62735566bcaf11109ac53f3e89dc9b80 Mon Sep 17 00:00:00 2001 From: AlexProgrammerDE <40795980+AlexProgrammerDE@users.noreply.github.com> Date: Thu, 18 Jul 2024 12:30:01 +0200 Subject: [PATCH] Use static Gson --- .../java/org/geysermc/geyser/session/GeyserSession.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/org/geysermc/geyser/session/GeyserSession.java b/core/src/main/java/org/geysermc/geyser/session/GeyserSession.java index 20a877a79..40443994c 100644 --- a/core/src/main/java/org/geysermc/geyser/session/GeyserSession.java +++ b/core/src/main/java/org/geysermc/geyser/session/GeyserSession.java @@ -230,6 +230,8 @@ import java.util.concurrent.atomic.AtomicInteger; @Getter public class GeyserSession implements GeyserConnection, GeyserCommandSource { + private static final Gson GSON = new Gson(); + private final GeyserImpl geyser; private final UpstreamSession upstream; private DownstreamSession downstream; @@ -620,8 +622,6 @@ public class GeyserSession implements GeyserConnection, GeyserCommandSource { @Setter @Getter private Map cookies = new Object2ObjectOpenHashMap<>(); - private final Gson gson = new Gson(); - private final GeyserCameraData cameraData; private final GeyserEntityData entityData; @@ -771,7 +771,7 @@ public class GeyserSession implements GeyserConnection, GeyserCommandSource { StepFullJavaSession step = PendingMicrosoftAuthentication.AUTH_FLOW.apply(true, 30); StepFullJavaSession.FullJavaSession response; try { - response = step.refresh(MinecraftAuthLogger.INSTANCE, PendingMicrosoftAuthentication.AUTH_CLIENT, step.fromJson(gson.fromJson(authChain, JsonObject.class))); + response = step.refresh(MinecraftAuthLogger.INSTANCE, PendingMicrosoftAuthentication.AUTH_CLIENT, step.fromJson(GSON.fromJson(authChain, JsonObject.class))); } catch (Exception e) { geyser.getLogger().error("Error while attempting to use auth chain for " + bedrockUsername() + "!", e); return Boolean.FALSE; @@ -784,7 +784,7 @@ public class GeyserSession implements GeyserConnection, GeyserCommandSource { new GameProfile(mcProfile.getId(), mcProfile.getName()), mcToken.getAccessToken() ); - geyser.saveAuthChain(bedrockUsername(), gson.toJson(step.toJson(response))); + geyser.saveAuthChain(bedrockUsername(), GSON.toJson(step.toJson(response))); return Boolean.TRUE; }).whenComplete((successful, ex) -> { if (this.closed) {