PandacubeFr
/
PandaLib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upgrade GUIHotBar: add ability to unregister the event listeners of the hotbar + optional cleanup of inventory on player removal

This commit is contained in:
Marc Baloup 2023-08-24 01:21:27 +02:00
parent a49061eb9f
commit f16389d33d
1 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pandalib-paper/src/main/java/fr/pandacube/lib/paper/gui/GUIHotBar.java
View File

@ -43,6 +43,12 @@ public class GUIHotBar implements Listener {
BukkitEvent.register(this); BukkitEvent.register(this);
} }
public void disable(boolean clearPlayerMenuItems) {
removeAllPlayers(clearPlayerMenuItems);
BukkitEvent.unregister(this);
}
/** /**
* Add the item to this hot bar menu. if there is already players hooked to this hot bar, the item will be directly added to * Add the item to this hot bar menu. if there is already players hooked to this hot bar, the item will be directly added to
@ -62,9 +68,9 @@ public class GUIHotBar implements Listener {
} }
/** /**
* Add the hot bar elements to this player. * Add the hot bar elements to this player, or update them if applicable.
* *
* The player is automatically removed when they quit. You can remove it before by calling {@link #removePlayer(Player)}. * The player is automatically removed when they quit. You can remove it before by calling {@link #removePlayer(Player, boolean)}.
*/ */
public void addPlayer(Player p) { public void addPlayer(Player p) {
if (!currentPlayers.contains(p)) if (!currentPlayers.contains(p))
@ -81,11 +87,20 @@ public class GUIHotBar implements Listener {
* Detach this player from this hot bar manager and removes the managed items from the players inventory. * Detach this player from this hot bar manager and removes the managed items from the players inventory.
*/ */
public void removePlayer(Player p) { public void removePlayer(Player p) {
removePlayer(p, true);
}
/**
* Detach this player from this hot bar manager and optionally removes the managed items from the players inventory.
*/
public void removePlayer(Player p, boolean clearMenuItems) {
if (!currentPlayers.contains(p)) if (!currentPlayers.contains(p))
return; return;
for (ItemStack is : itemsAndSetters.keySet()) { if (clearMenuItems) {
removeItemFromPlayer(p, is); for (ItemStack is : itemsAndSetters.keySet()) {
removeItemFromPlayer(p, is);
}
} }
currentPlayers.remove(p); currentPlayers.remove(p);
@ -100,8 +115,12 @@ public class GUIHotBar implements Listener {
public void removeAllPlayers() { public void removeAllPlayers() {
removeAllPlayers(true);
}
public void removeAllPlayers(boolean clearMenuItems) {
for (Player p : new ArrayList<>(currentPlayers)) for (Player p : new ArrayList<>(currentPlayers))
removePlayer(p); removePlayer(p, clearMenuItems);
} }
@ -211,7 +230,6 @@ public class GUIHotBar implements Listener {
if (!currentPlayers.contains(event.getPlayer())) if (!currentPlayers.contains(event.getPlayer()))
return; return;
currentPlayers.remove(event.getPlayer());
addPlayer(event.getPlayer()); addPlayer(event.getPlayer());
} }