From 78d3705a55166612ffdcec50c22a2843c9848138 Mon Sep 17 00:00:00 2001 From: kuroppoi <68156848+kuroppoi@users.noreply.github.com> Date: Thu, 22 Apr 2021 16:26:16 +0200 Subject: [PATCH] Better JSON deserializer rules --- .../main/java/brainwine/gameserver/entity/player/Player.java | 4 ++-- gameserver/src/main/java/brainwine/gameserver/zone/Zone.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gameserver/src/main/java/brainwine/gameserver/entity/player/Player.java b/gameserver/src/main/java/brainwine/gameserver/entity/player/Player.java index 658af5d..e760922 100644 --- a/gameserver/src/main/java/brainwine/gameserver/entity/player/Player.java +++ b/gameserver/src/main/java/brainwine/gameserver/entity/player/Player.java @@ -10,7 +10,7 @@ import java.util.Set; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonIncludeProperties; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonValue; @@ -51,7 +51,7 @@ import brainwine.gameserver.zone.MetaBlock; import brainwine.gameserver.zone.Zone; import brainwine.gameserver.zone.ZoneManager; -@JsonIgnoreProperties(ignoreUnknown = true) +@JsonIncludeProperties({"name", "email", "password_hash", "token_hash", "admin", "karma", "equipped_clothing", "equipped_colors"}) public class Player extends Entity implements CommandExecutor { public static final int MAX_SKILL_LEVEL = 15; diff --git a/gameserver/src/main/java/brainwine/gameserver/zone/Zone.java b/gameserver/src/main/java/brainwine/gameserver/zone/Zone.java index 1d48033..2e23f01 100644 --- a/gameserver/src/main/java/brainwine/gameserver/zone/Zone.java +++ b/gameserver/src/main/java/brainwine/gameserver/zone/Zone.java @@ -13,7 +13,7 @@ import java.util.Map.Entry; import java.util.Set; import com.fasterxml.jackson.annotation.JacksonInject; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonIncludeProperties; import com.fasterxml.jackson.annotation.JsonValue; import brainwine.gameserver.entity.Entity; @@ -37,7 +37,7 @@ import brainwine.gameserver.server.messages.ZoneExploredMessage; import brainwine.gameserver.server.messages.ZoneStatusMessage; import brainwine.gameserver.util.MathUtils; -@JsonIgnoreProperties(ignoreUnknown = true) +@JsonIncludeProperties({"name", "biome", "width", "height"}) public class Zone { public static final int DEFAULT_CHUNK_WIDTH = 20;