launch 1.1.9

toxicity188 · Nov 25, 2023 · a41a6df · a41a6df
1 parent bd9b723
commit a41a6df
Show file tree

Hide file tree

Showing 11 changed files with 36 additions and 29 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 }
 
 val questAdderGroup = "kor.toxicity.questadder"
-val questAdderVersion = "1.1.8"
+val questAdderVersion = "1.1.9"
 
 val adventureVersion = "4.14.0"
 val platformVersion = "4.3.1"

diff --git a/nms/v1_17_R1/src/main/java/kor/toxicity/questadder/nms/v1_17_R1/NMSChannelImpl.kt b/nms/v1_17_R1/src/main/java/kor/toxicity/questadder/nms/v1_17_R1/NMSChannelImpl.kt
@@ -45,9 +45,9 @@ class NMSChannelImpl: NMSChannel {
             QuestAdderBukkit.platform.changeSign(player, originalLocation, array)
             connection.send(ClientboundOpenSignEditorPacket(blockPos))
             it.signCallback = { arr ->
-                callback(arr)
+                connection.send(ClientboundBlockUpdatePacket(blockPos, air))
                 QuestAdderBukkit.task {
-                    connection.send(ClientboundBlockUpdatePacket(blockPos, air))
+                    callback(arr)
                 }
             }
         }

diff --git a/nms/v1_18_R1/src/main/java/kor/toxicity/questadder/nms/v1_18_R1/NMSChannelImpl.kt b/nms/v1_18_R1/src/main/java/kor/toxicity/questadder/nms/v1_18_R1/NMSChannelImpl.kt
@@ -45,9 +45,9 @@ class NMSChannelImpl: NMSChannel {
             QuestAdderBukkit.platform.changeSign(player, originalLocation, array)
             connection.send(ClientboundOpenSignEditorPacket(blockPos))
             it.signCallback = { arr ->
-                callback(arr)
+                connection.send(ClientboundBlockUpdatePacket(blockPos, air))
                 QuestAdderBukkit.task {
-                    connection.send(ClientboundBlockUpdatePacket(blockPos, air))
+                    callback(arr)
                 }
             }
         }

diff --git a/nms/v1_18_R2/src/main/java/kor/toxicity/questadder/nms/v1_18_R2/NMSChannelImpl.kt b/nms/v1_18_R2/src/main/java/kor/toxicity/questadder/nms/v1_18_R2/NMSChannelImpl.kt
@@ -45,9 +45,9 @@ class NMSChannelImpl: NMSChannel {
             QuestAdderBukkit.platform.changeSign(player, originalLocation, array)
             connection.send(ClientboundOpenSignEditorPacket(blockPos))
             it.signCallback = { arr ->
-                callback(arr)
+                connection.send(ClientboundBlockUpdatePacket(blockPos, air))
                 QuestAdderBukkit.task {
-                    connection.send(ClientboundBlockUpdatePacket(blockPos, air))
+                    callback(arr)
                 }
             }
         }

diff --git a/nms/v1_19_R1/src/main/java/kor/toxicity/questadder/nms/v1_19_R1/NMSChannelImpl.kt b/nms/v1_19_R1/src/main/java/kor/toxicity/questadder/nms/v1_19_R1/NMSChannelImpl.kt
@@ -45,9 +45,9 @@ class NMSChannelImpl: NMSChannel {
             QuestAdderBukkit.platform.changeSign(player, originalLocation, array)
             connection.send(ClientboundOpenSignEditorPacket(blockPos))
             it.signCallback = { arr ->
-                callback(arr)
+                connection.send(ClientboundBlockUpdatePacket(blockPos, air))
                 QuestAdderBukkit.task {
-                    connection.send(ClientboundBlockUpdatePacket(blockPos, air))
+                    callback(arr)
                 }
             }
         }

diff --git a/nms/v1_19_R2/src/main/java/kor/toxicity/questadder/nms/v1_19_R2/NMSChannelImpl.kt b/nms/v1_19_R2/src/main/java/kor/toxicity/questadder/nms/v1_19_R2/NMSChannelImpl.kt
@@ -45,9 +45,9 @@ class NMSChannelImpl: NMSChannel {
             QuestAdderBukkit.platform.changeSign(player, originalLocation, array)
             connection.send(ClientboundOpenSignEditorPacket(blockPos))
             it.signCallback = { arr ->
-                callback(arr)
+                connection.send(ClientboundBlockUpdatePacket(blockPos, air))
                 QuestAdderBukkit.task {
-                    connection.send(ClientboundBlockUpdatePacket(blockPos, air))
+                    callback(arr)
                 }
             }
         }

diff --git a/nms/v1_19_R3/src/main/java/kor/toxicity/questadder/nms/v1_19_R3/NMSChannelImpl.kt b/nms/v1_19_R3/src/main/java/kor/toxicity/questadder/nms/v1_19_R3/NMSChannelImpl.kt
@@ -45,9 +45,9 @@ class NMSChannelImpl: NMSChannel {
             QuestAdderBukkit.platform.changeSign(player, originalLocation, array)
             connection.send(ClientboundOpenSignEditorPacket(blockPos))
             it.signCallback = { arr ->
-                callback(arr)
+                connection.send(ClientboundBlockUpdatePacket(blockPos, air))
                 QuestAdderBukkit.task {
-                    connection.send(ClientboundBlockUpdatePacket(blockPos, air))
+                    callback(arr)
                 }
             }
         }

diff --git a/nms/v1_20_R1/src/main/java/kor/toxicity/questadder/nms/v1_20_R1/NMSChannelImpl.kt b/nms/v1_20_R1/src/main/java/kor/toxicity/questadder/nms/v1_20_R1/NMSChannelImpl.kt
@@ -45,9 +45,9 @@ class NMSChannelImpl: NMSChannel {
             QuestAdderBukkit.platform.changeSign(player, originalLocation, array)
             connection.send(ClientboundOpenSignEditorPacket(blockPos, true))
             it.signCallback = { arr ->
-                callback(arr)
+                connection.send(ClientboundBlockUpdatePacket(blockPos, air))
                 QuestAdderBukkit.task {
-                    connection.send(ClientboundBlockUpdatePacket(blockPos, air))
+                    callback(arr)
                 }
             }
         }

diff --git a/nms/v1_20_R2/src/main/java/kor/toxicity/questadder/nms/v1_20_R2/NMSChannelImpl.kt b/nms/v1_20_R2/src/main/java/kor/toxicity/questadder/nms/v1_20_R2/NMSChannelImpl.kt
@@ -45,9 +45,9 @@ class NMSChannelImpl: NMSChannel {
             QuestAdderBukkit.platform.changeSign(player, originalLocation, array)
             connection.send(ClientboundOpenSignEditorPacket(blockPos, true))
             it.signCallback = { arr ->
-                callback(arr)
+                connection.send(ClientboundBlockUpdatePacket(blockPos, air))
                 QuestAdderBukkit.task {
-                    connection.send(ClientboundBlockUpdatePacket(blockPos, air))
+                    callback(arr)
                 }
             }
         }

diff --git a/plugin/src/main/java/kor/toxicity/questadder/QuestAdderBukkit.kt b/plugin/src/main/java/kor/toxicity/questadder/QuestAdderBukkit.kt
@@ -98,7 +98,7 @@ import java.util.concurrent.ThreadLocalRandom
 class QuestAdderBukkit: JavaPlugin(), QuestAdderPlugin {
     companion object: QuestAdder {
 
-        const val VERSION = "1.1.8"
+        const val VERSION = "1.1.9"
 
         private val listener = object : Listener {
         }

diff --git a/plugin/src/main/java/kor/toxicity/questadder/mechanic/dialog/Dialog.kt b/plugin/src/main/java/kor/toxicity/questadder/mechanic/dialog/Dialog.kt
@@ -1010,19 +1010,26 @@ class Dialog(adder: QuestAdder, val file: File, private val dialogKey: String, s
         }))
     }
     private fun start(run: DialogRun): DialogState?  {
-        val uuid = run.current.player.uniqueId
-        if (!predicate(run.current)) {
-            subDialog?.let { l ->
-                if (l.isNotEmpty() && !playerTask.containsKey(uuid)) l.random().start(run.current)
+        try {
+            val uuid = run.current.player.uniqueId
+            if (!predicate(run.current)) {
+                subDialog?.let { l ->
+                    if (l.isNotEmpty() && !playerTask.containsKey(uuid)) l.random().start(run.current)
+                }
+                return null
             }
-            return null
-        }
-        if (playerTask.containsKey(uuid)) return null
-        playerTask[uuid] = run.apply {
-            initialTask(current)
-            start()
+            if (playerTask.containsKey(uuid)) return null
+            playerTask[uuid] = run.apply {
+                initialTask(current)
+                start()
+            }
+            return run.current.state
+        } catch (ex: Exception) {
+            QuestAdderBukkit.warn("runtime error: ${ex.message}")
+        } catch (ex: StackOverflowError) {
+            QuestAdderBukkit.warn("infinite loop error: dialog loops infinitely!")
         }
-        return run.current.state
+        return null
     }
 
     override fun getKey(): String {