Emergency fix part 2

xpdota · Sep 12, 2022 · 889feac · 889feac
1 parent 0cbe2c8
commit 889feac
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/xivsupport/src/main/java/gg/xp/xivsupport/events/state/RawXivCombatantInfo.java b/xivsupport/src/main/java/gg/xp/xivsupport/events/state/RawXivCombatantInfo.java
@@ -71,7 +71,13 @@ public RawXivCombatantInfo(
 		this.posZ = posZ;
 		this.heading = heading;
 		this.worldId = worldId;
-		this.worldName = worldName == null ? null : worldName.intern();
+		// new OP behavior
+		if (worldName == null || "outofrange2".equals(worldName)) {
+			this.worldName = null;
+		}
+		else {
+			this.worldName = worldName.intern();
+		}
 		this.bnpcId = bnpcId;
 		this.bnpcNameId = bnpcNameId;
 		this.partyType = partyType;

diff --git a/xivsupport/src/main/java/gg/xp/xivsupport/events/ws/ActWsHandlers.java b/xivsupport/src/main/java/gg/xp/xivsupport/events/ws/ActWsHandlers.java
@@ -3,7 +3,10 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.MapperFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.cfg.MapperBuilder;
+import com.fasterxml.jackson.databind.json.JsonMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.fasterxml.jackson.databind.node.TextNode;
 import gg.xp.reevent.events.EventContext;
@@ -41,7 +44,9 @@
 public class ActWsHandlers {
 
 	private static final Logger log = LoggerFactory.getLogger(ActWsHandlers.class);
-	private static final ObjectMapper mapper = new ObjectMapper();
+	private static final ObjectMapper mapper = JsonMapper.builder()
+			.configure(MapperFeature.ACCEPT_CASE_INSENSITIVE_PROPERTIES, true)
+			.build();
 	private final EventMaster master;
 	private final XivState state;
 	private final PullTracker pulls;

diff --git a/xivsupport/src/main/java/gg/xp/xivsupport/events/ws/ActWsLogSource.java b/xivsupport/src/main/java/gg/xp/xivsupport/events/ws/ActWsLogSource.java
@@ -317,7 +317,7 @@ public void start() {
 					"PartyType",
 					"ID",
 					"OwnerID",
-					"type",
+					"Type",
 					"Job",
 					"Level",
 					"Name",
-Original file line number
+Diff line change
@@ Expand Up / @@ -317,7 +317,7 @@ public void start() { @@
     					"PartyType",
     					"ID",
     					"OwnerID",
-    					"type",
+    					"Type",
     					"Job",
     					"Level",
     					"Name",
@@ Expand Down @@