Upstream/DungeonsXL
1
0
Fork 0
mirror of https://github.com/DRE2N/DungeonsXL.git synced 2025-02-17 21:02:12 +01:00
Code Issues Projects Releases Wiki Activity

Fix /dxl msg; resolves #758

Browse Source
This commit is contained in:
Daniel Saukel 2020-10-29 21:35:11 +01:00
parent 07d36cdb10
commit 0e3189ccb2
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
core/src/main/java/de/erethon/dungeonsxl/command/MsgCommand.java
View File

@ -18,6 +18,7 @@ package de.erethon.dungeonsxl.command;
import de.erethon.commons.chat.MessageUtil; import de.erethon.commons.chat.MessageUtil;
import de.erethon.dungeonsxl.DungeonsXL; import de.erethon.dungeonsxl.DungeonsXL;
import de.erethon.dungeonsxl.api.dungeon.Dungeon;
import de.erethon.dungeonsxl.api.dungeon.GameRule; import de.erethon.dungeonsxl.api.dungeon.GameRule;
import de.erethon.dungeonsxl.api.world.EditWorld; import de.erethon.dungeonsxl.api.world.EditWorld;
import de.erethon.dungeonsxl.config.DMessage; import de.erethon.dungeonsxl.config.DMessage;
@ -39,7 +40,8 @@ public class MsgCommand extends DCommand {
super(plugin); super(plugin);
setMinArgs(-1); setMinArgs(-1);
setMaxArgs(-1); setMaxArgs(-1);
setCommand("msg"); setCommand("message");
setAliases("msg");
setHelp(DMessage.CMD_MSG_HELP.getMessage()); setHelp(DMessage.CMD_MSG_HELP.getMessage());
setPermission(DPermission.MESSAGE.getNode()); setPermission(DPermission.MESSAGE.getNode());
setPlayerCommand(true); setPlayerCommand(true);
@ -105,6 +107,20 @@ public class MsgCommand extends DCommand {
msgs.put(id, msg); msgs.put(id, msg);
config.save(); config.save();
for (Dungeon dungeon : plugin.getDungeonRegistry()) {
if (!dungeon.getStartFloor().equals(editWorld.getResource())) {
continue;
}
// Only MFD overrideValues can override floor configs
if (dungeon.isMultiFloor()) {
Map<Integer, String> overrideValuesMSG = dungeon.getOverrideValues().getState(GameRule.MESSAGES);
if (overrideValuesMSG != null && overrideValuesMSG.containsKey(id)) {
continue;
}
}
dungeon.getRules().getState(GameRule.MESSAGES).put(id, msg);
}
} else { } else {
MessageUtil.sendMessage(player, DMessage.ERROR_MSG_FORMAT.getMessage()); MessageUtil.sendMessage(player, DMessage.ERROR_MSG_FORMAT.getMessage());
} }