From 9d696771b9c608c3afee2811dbebb1a3869b9f8f Mon Sep 17 00:00:00 2001
From: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com>
Date: Sun, 25 Feb 2024 08:29:12 +0100
Subject: Fixed /gfs not working with spaces in item name. #1045

---
 src/main/java/at/hannibal2/skyhanni/data/ChatManager.kt           | 8 +++++++-
 .../at/hannibal2/skyhanni/data/jsonobjects/repo/SacksJson.java    | 5 +++++
 2 files changed, 12 insertions(+), 1 deletion(-)

(limited to 'src/main/java/at/hannibal2/skyhanni/data')

diff --git a/src/main/java/at/hannibal2/skyhanni/data/ChatManager.kt b/src/main/java/at/hannibal2/skyhanni/data/ChatManager.kt
index 8b9ebc0d0..4650bda6d 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/ChatManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/ChatManager.kt
@@ -93,7 +93,13 @@ object ChatManager {
         )
 
         messageHistory[IdentityCharacteristics(component)] = result
-        if (MessageSendToServerEvent(message, message.split(" "), originatingModContainer).postAndCatch()) {
+        val trimmedMessage = message.trimEnd()
+        if (MessageSendToServerEvent(
+                trimmedMessage,
+                trimmedMessage.split(" "),
+                originatingModContainer
+            ).postAndCatch()
+        ) {
             event.isCanceled = true
             messageHistory[IdentityCharacteristics(component)] = result.copy(actionKind = ActionKind.OUTGOING_BLOCKED)
         }
diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/SacksJson.java b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/SacksJson.java
index 8a2765210..a2c6dc66e 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/SacksJson.java
+++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/SacksJson.java
@@ -5,6 +5,11 @@ import com.google.gson.annotations.Expose;
 import java.util.List;
 
 public class SacksJson {
+
+    @Deprecated
     @Expose
     public List<String> sackList;
+
+    @Expose
+    public List<String> sackItems;
 }
-- 
cgit