From 12fcf792258b76cf512e1a9824597101a8315171 Mon Sep 17 00:00:00 2001 From: Bella Date: Sun, 10 May 2020 20:49:37 -0400 Subject: [PATCH] Fix AutoTPA not splitting name from String correctly & close #798 --- .../kami/module/modules/chat/AutoTPA.kt | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/main/java/me/zeroeightsix/kami/module/modules/chat/AutoTPA.kt b/src/main/java/me/zeroeightsix/kami/module/modules/chat/AutoTPA.kt index b0b00f91d..de2326e0d 100644 --- a/src/main/java/me/zeroeightsix/kami/module/modules/chat/AutoTPA.kt +++ b/src/main/java/me/zeroeightsix/kami/module/modules/chat/AutoTPA.kt @@ -28,16 +28,17 @@ class AutoTPA : Module() { var receiveListener = Listener(EventHook { event: PacketEvent.Receive -> if (event.packet is SPacketChat && MessageDetectionHelper.isTPA(true, (event.packet as SPacketChat).getChatComponent().unformattedText)) { /* I tested that getting the first word is compatible with chat timestamp, and it as, as this is Receive and chat timestamp is after Receive */ - val firstWord = (event.packet as SPacketChat).getChatComponent().unformattedText.split("\\s+").toTypedArray()[0] - - if (friends.value && Friends.isFriend(firstWord)) { - MessageSendHelper.sendServerMessage("/tpaccept") - return@EventHook - } + val name = (event.packet as SPacketChat).getChatComponent().unformattedText.split(" ").toTypedArray()[0] when (mode.value) { - Mode.ACCEPT -> MessageSendHelper.sendServerMessage("/tpaccept") - Mode.DENY -> MessageSendHelper.sendServerMessage("/tpdeny") + Mode.ACCEPT -> MessageSendHelper.sendServerMessage("/tpaccept $name") + Mode.DENY -> { + if (friends.value && Friends.isFriend(name)) { + MessageSendHelper.sendServerMessage("/tpaccept $name") + } else { + MessageSendHelper.sendServerMessage("/tpdeny $name") + } + } } } })