diff options
| author | Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com> | 2024-02-25 12:52:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-25 12:52:08 +0100 |
| commit | 67261413a76819ad2ef16182f56e2c4b61b21012 (patch) | |
| tree | 69ff80409ace002885793dfef0df2af20f0ad65a | |
| parent | 2a8edee6275a4abe3375351455c27d2ee56f9c36 (diff) | |
| download | skyhanni-67261413a76819ad2ef16182f56e2c4b61b21012.tar.gz skyhanni-67261413a76819ad2ef16182f56e2c4b61b21012.tar.bz2 skyhanni-67261413a76819ad2ef16182f56e2c4b61b21012.zip | |
Fixed multiple edge cases with /gfs. (#1055)
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/api/GetFromSackAPI.kt | 4 | ||||
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/commands/tabcomplete/GetFromSacksTabComplete.kt | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/api/GetFromSackAPI.kt b/src/main/java/at/hannibal2/skyhanni/api/GetFromSackAPI.kt index 53cab5d02..433ac6c09 100644 --- a/src/main/java/at/hannibal2/skyhanni/api/GetFromSackAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/api/GetFromSackAPI.kt @@ -90,7 +90,7 @@ object GetFromSackAPI { if (!LorenzUtils.inSkyBlock) return if (queue.isNotEmpty() && lastTimeOfCommand.passedSince() >= minimumDelay) { val item = queue.poll() - ChatUtils.sendCommandToServer("gfs ${item.internalName.asString()} ${item.amount}") + ChatUtils.sendCommandToServer("gfs ${item.internalName.asString().replace('-', ':')} ${item.amount}") lastTimeOfCommand = ChatUtils.getTimeWhenNewlyQueuedMessageGetsExecuted() } } @@ -176,7 +176,7 @@ object GetFromSackAPI { return CommandResult.WRONG_AMOUNT to null } - val itemString = args.dropLast(1).joinToString(" ").uppercase() + val itemString = args.dropLast(1).joinToString(" ").uppercase().replace(':', '-') val item = when { sackListInternalNames.contains(itemString) -> itemString.asInternalName() diff --git a/src/main/java/at/hannibal2/skyhanni/features/commands/tabcomplete/GetFromSacksTabComplete.kt b/src/main/java/at/hannibal2/skyhanni/features/commands/tabcomplete/GetFromSacksTabComplete.kt index 424d72198..331c19fb0 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/commands/tabcomplete/GetFromSacksTabComplete.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/commands/tabcomplete/GetFromSacksTabComplete.kt @@ -25,12 +25,12 @@ object GetFromSacksTabComplete { if (event.senderIsSkyhanni()) return event - if (event.splitMessage.isEmpty()) return event + if (event.splitMessage.size < 3) return event - val rawName = event.splitMessage[1].uppercase() + val rawName = event.splitMessage.drop(1).dropLast(1).joinToString(" ") val realName = rawName.replace("_", " ") if (realName == rawName) return event - if (realName !in GetFromSackAPI.sackListNames) return event + if (realName.uppercase() !in GetFromSackAPI.sackListNames) return event return event.eventWithNewMessage(event.message.replace(rawName, realName)) } |