Skip to content

Correctif des lettres qui n'étaient pas récupérable à certains moments #1218

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

Correctif des lettres qui n'étaient pas récupérable à certains moments #1218

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
42ce211
fix: résoudre les items avant deleteLetter() dans LetterMenu
gtolontop Mar 22, 2026
c741b88
fix: ajout des accolades manquantes sur le guard TabList.init()
gtolontop Mar 22, 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
3 changes: 2 additions & 1 deletion src/main/java/fr/openmc/core/OMCPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,9 @@ public void onEnable() {
TPAQueue.initCommand();
FreezeManager.init();
QuestProgressSaveManager.init();
if (!isUnitTestVersion())
if (!isUnitTestVersion()) {
TabList.init();
}
AdminShopManager.init();
BossbarManager.init();
AnimationsManager.init();
Expand Down
39 changes: 24 additions & 15 deletions src/main/java/fr/openmc/core/features/mailboxes/menu/letter/LetterMenu.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
import fr.openmc.core.utils.messages.Prefix;
import fr.openmc.core.utils.serializer.BukkitSerializer;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.event.ClickEvent;
import net.kyori.adventure.text.format.NamedTextColor;
import org.bukkit.Bukkit;
import org.bukkit.World;
Expand All @@ -35,6 +34,7 @@
public class LetterMenu extends Menu {
private final Letter letter;
private final LetterHead letterHead;
private ItemStack[] resolvedItems;

@Override
public @NotNull String getName() {
Expand Down Expand Up @@ -82,7 +82,15 @@ public static void refuseLetter(Player player, int id) {
}

public void accept() {
ItemStack[] items = resolveItems();

if (MailboxManager.deleteLetter(letterHead.getLetterId())) {
HashMap<Integer, ItemStack> remainingItems = getOwner().getInventory().addItem(items);
World world = getOwner().getWorld();
for (ItemStack item : remainingItems.values()) {
world.dropItemNaturally(getOwner().getLocation(), item);
}

MessagesManager.sendMessage(
getOwner(),
Component.text("Vous avez reçu ", NamedTextColor.DARK_GREEN)
Expand All @@ -94,14 +102,8 @@ public void accept() {
);

Bukkit.getScheduler().runTask(OMCPlugin.getInstance(), () ->
Bukkit.getPluginManager().callEvent(new ClaimLetterEvent(getOwner(), MailboxManager.getById(getOwner(), letterHead.getLetterId())))
Bukkit.getPluginManager().callEvent(new ClaimLetterEvent(getOwner(), letter))
);

HashMap<Integer, ItemStack> remainingItems = getOwner().getInventory().addItem(letter.getCachedItems());
World world = getOwner().getWorld();
for (ItemStack item : remainingItems.values()) {
world.dropItemNaturally(getOwner().getLocation(), item);
}
} else {
Component message = Component.text("La lettre avec l'id ", NamedTextColor.DARK_RED)
.append(Component.text(letterHead.getLetterId(), NamedTextColor.RED))
Expand Down Expand Up @@ -132,15 +134,11 @@ public void onClose(InventoryCloseEvent event) {}
public @NotNull Map<Integer, ItemBuilder> getContent() {
Map<Integer, ItemBuilder> content = new HashMap<>();

ItemStack[] items = letter.getCachedItems();
ItemStack[] items = resolveItems();

if (items == null || items.length == 0) {
byte[] serializedItems = letter.getItems();
items = serializedItems != null ? BukkitSerializer.deserializeItemStacks(serializedItems) : new ItemStack[0];
}

for (int i = 0; i < items.length; i++)
for (int i = 0; i < items.length; i++) {
content.put(i + 9, new ItemBuilder(this, items[i]));
}

content.put(45, homeBtn(this));
content.put(48, acceptBtn(this).setOnClick(e -> accept()));
Expand All @@ -164,6 +162,17 @@ public void cancel() {
);
}

private ItemStack[] resolveItems() {
if (resolvedItems != null) return resolvedItems;
ItemStack[] items = letter.getCachedItems();
if (items == null || items.length == 0) {
byte[] serializedItems = letter.getItems();
items = serializedItems != null ? BukkitSerializer.deserializeItemStacks(serializedItems) : new ItemStack[0];
}
resolvedItems = items;
return items;
}

@Override
public List<Integer> getTakableSlot() {
return List.of();
Expand Down
Loading