Take the item before starting the dialogue.

GenerationsMod · Oct 31, 2024 · c63b29f · c63b29f
1 parent f8c69b1
commit c63b29f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/...a/generations/gg/generations/core/generationscore/common/GenerationsArchitecturyEvents.kt b/...a/generations/gg/generations/core/generationscore/common/GenerationsArchitecturyEvents.kt
@@ -37,7 +37,7 @@ object GenerationsArchitecturyEvents {
                 ) {
                     val dialogue: Dialogue = Dialogues.dialogues[GenerationsCore.id("tapu_spawn")]
                         ?: return@register EventResult.interruptFalse()
-
+                    player.getItemInHand(hand).shrink(1)
                     player.openDialogue(dialogue)
 
                     return@register EventResult.interruptTrue()
@@ -48,6 +48,7 @@ object GenerationsArchitecturyEvents {
                     val dialogue: Dialogue = Dialogues.dialogues[GenerationsCore.id("therian_spawn")]
                         ?: return@register EventResult.interruptFalse()
 
+                    player.getItemInHand(hand).shrink(1)
                     player.openDialogue(dialogue)
 
                     return@register EventResult.interruptTrue()

diff --git a/common/src/main/resources/data/generations_core/dialogues/tapu_spawn.json b/common/src/main/resources/data/generations_core/dialogues/tapu_spawn.json
@@ -120,7 +120,6 @@
         "allowSkip": false,
         "delay": 1,
         "action": [
-          "q.player.main_hand.shrink(1);",
           "q.spawn_pokemon(q.player, v.pokemon_id + ' level=70', 'generations_core:tapu_shrine', 'generations_core:tapu_shrine');",
           "q.dialogue.close();"
         ]

diff --git a/common/src/main/resources/data/generations_core/dialogues/therian_spawn.json b/common/src/main/resources/data/generations_core/dialogues/therian_spawn.json
@@ -120,7 +120,6 @@
         "allowSkip": false,
         "delay": 1,
         "action": [
-          "q.player.main_hand.shrink(1);",
           "q.spawn_pokemon(q.player, v.pokemon_id + ' level=70', 'generations_core:abundant_shrine', 'generations_core:abundant_shrine');",
           "q.dialogue.close();"
         ]