Skip to content

Fix inventory restoration on plugin disable #215

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

Fix inventory restoration on plugin disable #215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0fcb12a
Fix inventory restoration on plugin disable
AxDevv Jan 27, 2026
6647f49
Fix PacketEvents warning on plugin disable
AxDevv Jan 27, 2026
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
2 changes: 2 additions & 0 deletions API/src/main/java/fr/maxlego08/menu/api/players/inventory/InventoriesPlayer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,6 @@ public interface InventoriesPlayer extends Listener {

void loadInventories();

void restoreAllInventories();

}
7 changes: 4 additions & 3 deletions src/main/java/fr/maxlego08/menu/ZMenuPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,9 +397,13 @@ private List<String> getInventoriesFiles() {
@Override
public void onDisable() {

if (this.packetUtils != null)
this.packetUtils.onDisable();

this.preDisable();

if (this.vinventoryManager != null) this.vinventoryManager.close();
this.inventoriesPlayer.restoreAllInventories();

Configuration.getInstance().save(getConfig(), this.configFile);

Expand All @@ -411,9 +415,6 @@ public void onDisable() {

this.itemManager.unloadListeners();

if (this.packetUtils != null)
this.packetUtils.onDisable();

getServer().getServicesManager().unregisterAll(this);

this.postDisable();
Expand Down
12 changes: 12 additions & 0 deletions src/main/java/fr/maxlego08/menu/players/inventory/ZInventoriesPlayer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import fr.maxlego08.menu.api.players.inventory.InventoriesPlayer;
import fr.maxlego08.menu.api.players.inventory.InventoryPlayer;
import fr.maxlego08.menu.api.storage.dto.InventoryDTO;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.player.PlayerJoinEvent;
Expand Down Expand Up @@ -121,4 +122,15 @@ public void loadInventories() {
}
this.inventories.putAll(loadedInventories);
}

@Override
public void restoreAllInventories() {
new HashMap<>(inventories).forEach((uuid, inventoryPlayer) -> {
Player player = Bukkit.getPlayer(uuid);
if (player != null && player.isOnline()) {
inventoryPlayer.forceGiveInventory(player);
}
inventories.remove(uuid);
});
}
}
7 changes: 5 additions & 2 deletions src/main/java/fr/maxlego08/menu/players/inventory/ZInventoryPlayer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,11 @@ public void forceGiveInventory(@NonNull Player player) {
for (int slot = 0; slot <= MAX_INVENTORY_SIZE; slot++) {
if (items.containsKey(slot)) {
playerInventory.setItem(slot, ItemStackUtils.deserializeItemStack(items.get(slot)));
} else if (this.plugin.getDupeManager().isDupeItem(playerInventory.getItem(slot))) {
playerInventory.setItem(slot, null);
} else {
ItemStack itemStack = playerInventory.getItem(slot);
if (itemStack != null && this.plugin.getDupeManager().isDupeItem(itemStack)) {
playerInventory.setItem(slot, null);
}
}
}
}
Expand Down