Fork/CommandPanels
2
0
Fork 0
forked from Upstream/CommandPanels
Code Pull Requests Actions Releases 1 Activity

Merge pull request #297 from TinyTank800/master

Browse Source 
Multiple fixes to hotbar items.
This commit is contained in:
RockyHawk 2024-02-16 16:46:49 +11:00 committed by GitHub
commit 41383140b5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/me/rockyhawk/commandpanels/openwithitem/UtilsOpenWithItem.java
View File

@ -9,6 +9,7 @@ import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.block.Action;
import org.bukkit.event.block.BlockPlaceEvent;
import org.bukkit.event.entity.PlayerDeathEvent;
import org.bukkit.event.inventory.InventoryAction;
import org.bukkit.event.inventory.InventoryClickEvent;
@ -67,6 +68,21 @@ public class UtilsOpenWithItem implements Listener {
}
}
@EventHandler
public void onBlockPlace(BlockPlaceEvent e)
{
//item right-clicked only (not left because that causes issues when things are interacted with)
if(!plugin.openWithItem){
//if none of the panels have open-with-item
return;
}
Player p = e.getPlayer();
if(plugin.hotbar.itemCheckExecute(e.getPlayer().getInventory().getItemInMainHand(),p,false,false)){
e.setCancelled(true);
p.updateInventory();
}
}
@EventHandler
public void onWorldChange(PlayerChangedWorldEvent e){
plugin.hotbar.updateHotbarItems(e.getPlayer());
}
@ -83,7 +99,7 @@ public class UtilsOpenWithItem implements Listener {
//a new list instance has to be created with the dropped items to avoid ConcurrentModificationException
for(ItemStack s : new ArrayList<>(e.getDrops())){
try {
if (plugin.nbt.getNBT(s, "CommandPanelsHotbar") != null) {
if (!plugin.nbt.getNBT(s, "CommandPanelsHotbar").isEmpty()) {
//do not remove items that are not stationary
if(!plugin.nbt.getNBT(s, "CommandPanelsHotbar").endsWith("-1")) {
e.getDrops().remove(s);