From a53328346a22fede05d09c79c13cd22b0827cb2b Mon Sep 17 00:00:00 2001 From: KingRainbow44 Date: Thu, 20 Apr 2023 00:22:29 -0400 Subject: [PATCH] Fix avatar trial status being saved to the database --- src/main/java/emu/grasscutter/game/avatar/Avatar.java | 2 +- .../emu/grasscutter/server/http/dispatch/RegionHandler.java | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/main/java/emu/grasscutter/game/avatar/Avatar.java b/src/main/java/emu/grasscutter/game/avatar/Avatar.java index aba83ffb0..3f961b8b9 100644 --- a/src/main/java/emu/grasscutter/game/avatar/Avatar.java +++ b/src/main/java/emu/grasscutter/game/avatar/Avatar.java @@ -106,7 +106,7 @@ public class Avatar { @Getter @Setter private int fromParentQuestId = 0; // so far no outer class or prop value has information of this, but from packet: // 1 = normal, 2 = trial avatar - @Getter @Setter private int avatarType = Type.NORMAL.getNumber(); + @Transient @Getter @Setter private int avatarType = Type.NORMAL.getNumber(); @Deprecated // Do not use. Morhpia only! public Avatar() { diff --git a/src/main/java/emu/grasscutter/server/http/dispatch/RegionHandler.java b/src/main/java/emu/grasscutter/server/http/dispatch/RegionHandler.java index 0c7a2914a..f5e44881e 100644 --- a/src/main/java/emu/grasscutter/server/http/dispatch/RegionHandler.java +++ b/src/main/java/emu/grasscutter/server/http/dispatch/RegionHandler.java @@ -166,7 +166,6 @@ public final class RegionHandler implements Router { // Use the CN region list. QueryAllRegionsEvent event = new QueryAllRegionsEvent(regionListResponsecn); event.call(); - logger.debug("Connect to Chinese version"); // Respond with the event result. ctx.result(event.getRegionList()); @@ -176,7 +175,6 @@ public final class RegionHandler implements Router { // Use the OS region list. QueryAllRegionsEvent event = new QueryAllRegionsEvent(regionListResponse); event.call(); - logger.debug("Connect to global version"); // Respond with the event result. ctx.result(event.getRegionList()); @@ -191,7 +189,6 @@ public final class RegionHandler implements Router { // Use the default region list. QueryAllRegionsEvent event = new QueryAllRegionsEvent(regionListResponse); event.call(); - logger.debug("Connect to global version"); // Respond with the event result. ctx.result(event.getRegionList()); @@ -200,7 +197,6 @@ public final class RegionHandler implements Router { // Use the default region list. QueryAllRegionsEvent event = new QueryAllRegionsEvent(regionListResponse); event.call(); - logger.debug("Connect to global version"); // Respond with the event result. ctx.result(event.getRegionList());