feat: improve action form logics

EndstoneMC · Aug 5, 2024 · 89058cd · 89058cd
1 parent 2b1cbea
commit 89058cd
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 20 deletions.
diff --git a/include/endstone/form/action_form.h b/include/endstone/form/action_form.h
@@ -114,19 +114,7 @@ class ActionForm : public Form<ActionForm> {
 
     using OnSubmitCallback = std::function<void(Player *, int)>;
 
-    explicit ActionForm()
-    {
-        on_submit_ = [this](Player *player, int selection) {
-            if (selection < 0 || selection >= buttons_.size()) {
-                return;
-            }
-            auto &button = buttons_[selection];
-            auto on_click = button.getOnClick();
-            if (on_click) {
-                on_click(player);
-            }
-        };
-    }
+    explicit ActionForm() = default;
 
     /**
      * @brief Get the content of the form.

diff --git a/src/endstone_core/player.cpp b/src/endstone_core/player.cpp
@@ -591,20 +591,25 @@ void EndstonePlayer::onFormResponse(int form_id, const nlohmann::json &json)
         try {
             std::visit(entt::overloaded{
                            [&](const MessageForm &form) {
-                               auto callback = form.getOnSubmit();
-                               if (callback) {
+                               if (auto callback = form.getOnSubmit()) {
                                    callback(this, json.get<bool>() ? 0 : 1);
                                }
                            },
                            [&](const ActionForm &form) {
-                               auto callback = form.getOnSubmit();
-                               if (callback) {
-                                   callback(this, json.get<int>());
+                               int selection = json.get<int>();
+                               if (auto callback = form.getOnSubmit()) {
+                                   callback(this, selection);
+                               }
+                               const auto &buttons = form.getButtons();
+                               if (selection >= 0 && selection < buttons.size()) {
+                                   const auto &button = buttons[selection];
+                                   if (auto on_click = button.getOnClick()) {
+                                       on_click(this);
+                                   }
                                }
                            },
                            [&](const ModalForm &form) {
-                               auto callback = form.getOnSubmit();
-                               if (callback) {
+                               if (auto callback = form.getOnSubmit()) {
                                    callback(this, json.dump());
                                }
                            },