Skip to content

Commit 398869a

Browse files
Empêche les joueurs de mailbox dans la dimension des rêves (#1118)
* Mailbox in Dream * Add more `DreamUtils.isInDreamWorld` * Everything
1 parent 9655723 commit 398869a

File tree

2 files changed

+17
-1
lines changed

2 files changed

+17
-1
lines changed

src/main/java/fr/openmc/core/features/mainmenu/menus/Page1.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,23 @@
1616
import fr.openmc.core.features.contest.commands.ContestCommand;
1717
import fr.openmc.core.features.contest.managers.ContestManager;
1818
import fr.openmc.core.features.contest.models.Contest;
19+
import fr.openmc.core.features.dream.DreamUtils;
1920
import fr.openmc.core.features.homes.command.TpHomeCommand;
2021
import fr.openmc.core.features.mailboxes.MailboxCommand;
2122
import fr.openmc.core.features.mainmenu.listeners.PacketListener;
2223
import fr.openmc.core.features.milestones.menus.MainMilestonesMenu;
2324
import fr.openmc.core.features.quests.command.QuestCommand;
2425
import fr.openmc.core.features.settings.command.SettingsCommand;
2526
import fr.openmc.core.utils.DateUtils;
27+
import fr.openmc.core.utils.messages.MessageType;
28+
import fr.openmc.core.utils.messages.MessagesManager;
29+
import fr.openmc.core.utils.messages.Prefix;
2630
import net.kyori.adventure.text.Component;
2731
import net.kyori.adventure.text.format.NamedTextColor;
2832
import net.kyori.adventure.text.format.TextDecoration;
2933
import net.minecraft.network.protocol.game.ClientboundUpdateAdvancementsPacket;
3034
import net.minecraft.server.level.ServerPlayer;
3135
import org.bukkit.Bukkit;
32-
import org.bukkit.ChatColor;
3336
import org.bukkit.Material;
3437
import org.bukkit.NamespacedKey;
3538
import org.bukkit.craftbukkit.entity.CraftPlayer;
@@ -213,6 +216,12 @@ public void onInventoryClick(InventoryClickEvent event) {
213216
return;
214217
}
215218

219+
if (DreamUtils.isInDreamWorld(player)) {
220+
PacketMenuLib.closeMenu(player);
221+
MessagesManager.sendMessage(player, Component.text("Vous ne pouvez pas interagir avec le menu principal depuis le monde des rêves.", NamedTextColor.RED), Prefix.OPENMC, MessageType.ERROR, true);
222+
return;
223+
}
224+
216225
int slot = event.slot();
217226
if (CITY_SLOTS.contains(slot)) {
218227
Bukkit.getScheduler().runTask(OMCPlugin.getInstance(), () -> CityCommands.mainCommand(player));

src/main/java/fr/openmc/core/features/mainmenu/menus/Page2.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import fr.openmc.api.packetmenulib.menu.InventoryType;
99
import fr.openmc.api.packetmenulib.menu.Menu;
1010
import fr.openmc.core.OMCPlugin;
11+
import fr.openmc.core.features.dream.DreamUtils;
1112
import fr.openmc.core.features.economy.commands.BankCommands;
1213
import fr.openmc.core.features.mailboxes.MailboxCommand;
1314
import fr.openmc.core.features.mainmenu.listeners.PacketListener;
@@ -153,6 +154,12 @@ public void onInventoryClick(InventoryClickEvent event) {
153154
return;
154155
}
155156

157+
if (DreamUtils.isInDreamWorld(player)) {
158+
PacketMenuLib.closeMenu(player);
159+
MessagesManager.sendMessage(player, Component.text("Vous ne pouvez pas interagir avec le menu principal depuis le monde des rêves.", NamedTextColor.RED), Prefix.OPENMC, MessageType.ERROR, true);
160+
return;
161+
}
162+
156163
int slot = event.slot();
157164
if (LEFT_ARROW_SLOT == slot) {
158165
PacketMenuLib.openMenu(new Page1(player), player);

0 commit comments

Comments
 (0)