diff options
| author | Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com> | 2024-02-25 08:29:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-25 08:29:12 +0100 |
| commit | 9d696771b9c608c3afee2811dbebb1a3869b9f8f (patch) | |
| tree | bd624b67ad2edf84638eb8fd9ee2ec521ce2da05 /src/main/java/at/hannibal2/skyhanni/data | |
| parent | 16d6a47c85be560517505499df1fff6df9582c18 (diff) | |
| download | skyhanni-9d696771b9c608c3afee2811dbebb1a3869b9f8f.tar.gz skyhanni-9d696771b9c608c3afee2811dbebb1a3869b9f8f.tar.bz2 skyhanni-9d696771b9c608c3afee2811dbebb1a3869b9f8f.zip | |
Fixed /gfs not working with spaces in item name. #1045
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/data')
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/data/ChatManager.kt | 8 | ||||
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/SacksJson.java | 5 |
2 files changed, 12 insertions, 1 deletions
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; } |