Skip to content

fix: skip companion/tutorial prompts without permission #263

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

Merged
Zoriot merged 1 commit into from
Nov 13, 2026
Merged

fix: skip companion/tutorial prompts without permission #263

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
16 changes: 10 additions & 6 deletions src/main/java/com/alpsbte/plotsystem/core/EventListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,13 @@ public void onPlayerJoinEvent(@NotNull PlayerJoinEvent event) {
@EventHandler
public void onPlayerInteractEvent(@NotNull PlayerInteractEvent event) {
if (event.getAction().equals(Action.RIGHT_CLICK_BLOCK) || event.getAction().equals(Action.RIGHT_CLICK_AIR)) {
if (event.getItem() != null && event.getItem().equals(CompanionMenu.getMenuItem(event.getPlayer()))) {
event.getPlayer().performCommand("companion");
} else if (event.getItem() != null && event.getItem().equals(ReviewMenu.getMenuItem(event.getPlayer()))) {
event.getPlayer().performCommand("review");
Player player = event.getPlayer();
if (event.getItem() != null && event.getItem().equals(CompanionMenu.getMenuItem(player))
&& player.hasPermission("plotsystem.companion")) {
player.performCommand("companion");
} else if (event.getItem() != null && event.getItem().equals(ReviewMenu.getMenuItem(player))
&& player.hasPermission("plotsystem.review")) {
player.performCommand("review");
}
}

Expand Down Expand Up @@ -269,8 +272,9 @@ private void handleIronTrapdoorClick(@NotNull PlayerInteractEvent event) {
private void sendNotices(@NotNull Player player, Builder builder) {
sendReviewNotices(player, builder);

// Start or notify the player if he has not completed the beginner tutorial yet (only if required)
if (TutorialPlot.isRequiredAndInProgress(TutorialCategory.BEGINNER.getId(), player.getUniqueId())) {
// Start or notify only when the player can actually run /tutorial
if (player.hasPermission("plotsystem.tutorial")
&& TutorialPlot.isRequiredAndInProgress(TutorialCategory.BEGINNER.getId(), player.getUniqueId())) {
if (!player.hasPlayedBefore()) {
// If disabled, the player has to start the tutorial manually
if (PlotSystem.getPlugin().getConfig().getBoolean(ConfigPaths.BEGINNER_TUTORIAL_START_ON_FIRST_JOIN, true))
Expand Down
13 changes: 10 additions & 3 deletions src/main/java/com/alpsbte/plotsystem/utils/Utils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,18 @@ public static Location getSpawnLocation() {

public static void updatePlayerInventorySlots(Player player) {
Bukkit.getScheduler().runTaskAsynchronously(PlotSystem.getPlugin(), () -> {
// Add Items
player.getInventory().setItem(8, CompanionMenu.getMenuItem(player));
// Only place hotbar shortcuts the player can actually use
if (player.hasPermission("plotsystem.companion")) {
player.getInventory().setItem(8, CompanionMenu.getMenuItem(player));
} else {
player.getInventory().setItem(8, ItemStack.empty());
}

if (player.hasPermission("plotsystem.review")) {
player.getInventory().setItem(7, ReviewMenu.getMenuItem(player));
} else player.getInventory().setItem(7, ItemStack.empty());
} else {
player.getInventory().setItem(7, ItemStack.empty());
}
});
}

Expand Down
Loading