Skip to content

Fix open_commands actions running after menu item render #287

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lukichov1 wants to merge 1 commit into
base: main
Choose a base branch
from
+17 −11
Open

Fix open_commands actions running after menu item render #287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/main/java/com/extendedclip/deluxemenus/config/DeluxeMenusConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import com.extendedclip.deluxemenus.utils.VersionHelper;
import com.google.common.base.Enums;
import com.google.common.primitives.Ints;
import org.bukkit.Bukkit;
import org.bukkit.DyeColor;
import org.bukkit.Location;
import org.bukkit.Material;
Expand Down Expand Up @@ -1238,6 +1239,11 @@ public void onClick(@NotNull final MenuHolder holder) {
continue;
}

if (Bukkit.isPrimaryThread()) {
actionTask.run();
continue;
}

actionTask.runTask(plugin);
}
}
Expand Down
22 changes: 11 additions & 11 deletions src/main/java/com/extendedclip/deluxemenus/menu/Menu.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,11 +300,13 @@ public void openMenu(final @NotNull Player viewer, final @Nullable Map<String, S
return;
}

if (!this.handleOpenRequirements(holder)) {
return;
}

scheduler.runTaskAsynchronously(() -> {
if (!this.handleOpenRequirements(holder)) {
return;
}

this.options.openHandler().ifPresent(h -> h.onClick(holder));

scheduler.runTaskAsynchronously(() -> {

Set<MenuItem> activeItems = new HashSet<>();

Expand Down Expand Up @@ -343,12 +345,10 @@ public void openMenu(final @NotNull Player viewer, final @Nullable Map<String, S
return;
}

holder.setMenuName(this.options.name());
holder.setActiveItems(activeItems);

this.options.openHandler().ifPresent(h -> h.onClick(holder));

String title = StringUtils.color(holder.setPlaceholdersAndArguments(this.options.title()));
holder.setMenuName(this.options.name());
holder.setActiveItems(activeItems);

String title = StringUtils.color(holder.setPlaceholdersAndArguments(this.options.title()));

Inventory inventory;

Expand Down