ARK Genesis "TribeId" fix

McBane87 · Feb 28, 2020 · 995b6a0 · 995b6a0
1 parent 6853eee
commit 995b6a0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/main/java/qowyn/ark/tools/data/Player.java b/src/main/java/qowyn/ark/tools/data/Player.java
@@ -106,7 +106,7 @@ public Player(Path path, DataContext context, ReadingOptions ro) throws IOExcept
     uniqueId = myData.getPropertyValue("UniqueID", StructUniqueNetIdRepl.class);
     savedNetworkAddress = myData.getPropertyValue("SavedNetworkAddress", String.class);
     playerName = myData.getPropertyValue("PlayerName", String.class);
-    tribeId = myData.findPropertyValue("TribeID", Integer.class).orElse(0);
+    tribeId = myData.findPropertyValue("TribeID", Integer.class).orElse(myData.findPropertyValue("TribeId", Integer.class).orElse(0));
     playerDataVersion = myData.findPropertyValue("PlayerDataVersion", Integer.class).orElse(0);
     spawnDayNumber = myData.findPropertyValue("SpawnDayNumber", Integer.class).orElse(0);
     spawnDayTime = myData.findPropertyValue("SpawnDayTime", Float.class).orElse(0.0f);

diff --git a/src/main/java/qowyn/ark/tools/data/Tribe.java b/src/main/java/qowyn/ark/tools/data/Tribe.java
@@ -64,7 +64,7 @@ public Tribe(Path path, ReadingOptions ro) throws IOException {
 
     tribeName = tribeData.findPropertyValue("TribeName", String.class).orElse("");
     ownerPlayerDataId = tribeData.findPropertyValue("OwnerPlayerDataID", Integer.class).orElse(0);
-    tribeId = tribeData.findPropertyValue("TribeID", Integer.class).orElse(0);
+    tribeId = tribeData.findPropertyValue("TribeID", Integer.class).orElse(tribeData.findPropertyValue("TribeId", Integer.class).orElse(0));
 
     ArkArrayString membersNames = tribeData.getPropertyValue("MembersPlayerName", ArkArrayString.class);
     if (membersNames != null) {