Skip to content

Fixed removing EChests from Tuner and Tuner opening in other GUIs #90

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
Sefiraat wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixed removing EChests from Tuner and Tuner opening in other GUIs #90

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9846ad9
Fixed removing ender chests and tuner opening in other GUIs
Sefiraat Jul 5, 2021
29b7b12
Tuner interaction comment
Sefiraat Jul 6, 2021
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
22 changes: 12 additions & 10 deletions src/main/java/io/github/thebusybiscuit/sensibletoolbox/items/EnderTuner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.entity.HumanEntity;
import org.bukkit.entity.Player;
import org.bukkit.event.block.Action;
import org.bukkit.event.inventory.ClickType;
import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.inventory.ItemStack;
Expand Down Expand Up @@ -80,16 +81,18 @@ public boolean hasGlow() {

@Override
public void onInteractItem(PlayerInteractEvent event) {
Block clicked = event.getClickedBlock();
BaseSTBBlock stb = clicked == null ? null : SensibleToolbox.getBlockAt(clicked.getLocation(), true);
if (event.getAction() == Action.RIGHT_CLICK_AIR || event.getAction() == Action.RIGHT_CLICK_BLOCK) {
Block clicked = event.getClickedBlock();
BaseSTBBlock stb = clicked == null ? null : SensibleToolbox.getBlockAt(clicked.getLocation(), true);

if (stb instanceof EnderTunable && stb.hasAccessRights(event.getPlayer())) {
tuningBlock = (EnderTunable) stb;
}
if (stb instanceof EnderTunable && stb.hasAccessRights(event.getPlayer())) {
tuningBlock = (EnderTunable) stb;
}

inventoryGUI = makeTuningGUI(event.getPlayer());
inventoryGUI.show(event.getPlayer());
event.setCancelled(true);
inventoryGUI = makeTuningGUI(event.getPlayer());
inventoryGUI.show(event.getPlayer());
event.setCancelled(true);
}
}

@Nonnull
Expand Down Expand Up @@ -211,9 +214,8 @@ public boolean onShiftClickExtract(HumanEntity player, int slot, ItemStack toExt
if (tuningBlock != null) {
if (player instanceof Player) {
STBUtil.complain((Player) player);
} else {
return false;
}
return false;
}

if (slot == TUNED_ITEM_SLOT && inventoryGUI.getItem(slot) != null) {
Expand Down