Skip to content

Commit 11551a1

Browse files
authored
Fix lors du refus de la mailbox (#1134)
* Revert "Refactor ConfirmMenu and MenuLib for improved readability and consistency" This reverts commit f7cf2bf. * Fix refus mailbox * ups
1 parent 55e2c29 commit 11551a1

1 file changed

Lines changed: 10 additions & 10 deletions

File tree

src/main/java/fr/openmc/core/features/mailboxes/menu/PendingMailbox.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -114,29 +114,29 @@ public static void cancelLetter(Player player, int id) {
114114
message,
115115
Prefix.MAILBOX,
116116
MessageType.ERROR,
117-
true
118-
);
117+
true);
118+
return;
119119
}
120120

121121
int itemsCount = letter.getNumItems();
122122
ItemStack[] items = BukkitSerializer.deserializeItemStacks(letter.getItems());
123-
Player receiver = CacheOfflinePlayer.getOfflinePlayer(letter.getReceiver()).getPlayer();
123+
Player sender = CacheOfflinePlayer.getOfflinePlayer(letter.getSender()).getPlayer();
124124

125125
if (MailboxManager.deleteLetter(id)) {
126-
if (receiver != null)
127-
MailboxManager.cancelLetter(receiver);
128-
MailboxManager.givePlayerItems(player, items);
129-
Component message = Component.text("Vous avez annulé la lettre et reçu ", NamedTextColor.DARK_GREEN)
126+
if (sender != null)
127+
MailboxManager.cancelLetter(sender);
128+
MailboxManager.givePlayerItems(sender, items);
129+
Component message = Component.text(player.getName(), NamedTextColor.DARK_GREEN)
130+
.append(Component.text(" a annulé la lettre. Vous avez reçu ", NamedTextColor.DARK_GREEN))
130131
.append(Component.text(itemsCount, NamedTextColor.GREEN))
131132
.append(Component.text(pluralize(" item", itemsCount), NamedTextColor.DARK_GREEN));
132133

133134
MessagesManager.sendMessage(
134-
player,
135+
sender,
135136
message,
136137
Prefix.MAILBOX,
137138
MessageType.SUCCESS,
138-
true
139-
);
139+
true);
140140
}
141141
}
142142
}

0 commit comments

Comments
 (0)