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

Fix loading order; resolves #156

Browse Source
This commit is contained in:
Daniel Saukel 2016-09-11 14:35:52 +02:00
parent 941831643c
commit 6224c931db
4 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/main/java/io/github/dre2n/dungeonsxl/DungeonsXL.java
View File

@ -266,7 +266,8 @@ public class DungeonsXL extends BRPlugin {
loadRewardTypes();
loadTriggers();
loadDSigns();
loadDungeons();
loadDWorlds(MAPS);
loadDungeons(DUNGEONS);
loadGlobalProtections();
loadExternalMobProviders();
loadDPlayers();
@ -275,7 +276,6 @@ public class DungeonsXL extends BRPlugin {
loadDLootTables(LOOT_TABLES);
loadDMobTypes(MOBS);
loadSignScripts(SIGNS);
loadDWorlds(MAPS);
loadDCommands();
}
@ -446,8 +446,8 @@ public class DungeonsXL extends BRPlugin {
/**
* load / reload a new instance of Dungeons
*/
public void loadDungeons() {
dungeons = new Dungeons();
public void loadDungeons(File file) {
dungeons = new Dungeons(file);
}
/**

1
core/src/main/java/io/github/dre2n/dungeonsxl/command/PlayCommand.java
View File

@ -20,7 +20,6 @@ import io.github.dre2n.commons.command.BRCommand;
import io.github.dre2n.commons.util.messageutil.MessageUtil;
import io.github.dre2n.dungeonsxl.DungeonsXL;
import io.github.dre2n.dungeonsxl.config.DMessages;
import io.github.dre2n.dungeonsxl.config.DungeonConfig;
import io.github.dre2n.dungeonsxl.dungeon.Dungeon;
import io.github.dre2n.dungeonsxl.event.dgroup.DGroupCreateEvent;
import io.github.dre2n.dungeonsxl.game.Game;

3
core/src/main/java/io/github/dre2n/dungeonsxl/config/DMessages.java
View File

@ -157,7 +157,8 @@ public enum DMessages implements Messages {
GROUP_PLAYER_JOINED("Group_PlayerJoined", "&6Player &4&v1&6 has joined the group!"),
GROUP_WAVE_FINISHED("Group_WaveFinished", "&6Your group finished wave no. &4&v1&6. The next one is going to start in &4&v2&6 seconds."),
LOG_DISABLED_TWEAKS("Log_DisabledTweaks", "&4Disabled performance tweaks because there is no support for this server software."),
LOG_ERROR_MOB_ENCHANTMENT("Log_Error_MobEnchantment", "&4Error at loading mob.yml: Enchantment &6&v1&4 doesn't exist!"),
LOG_ERROR_DUNGEON_SETUP("Log_Error_DungeonSetup", "&4The setup of dungeon &6&v1&4 is incorrect. See https://github.com/DRE2N/DungeonsXL/wiki/dungeon-configuration for reference."),
LOG_ERROR_MOB_ENCHANTMENT("Log_Error_MobEnchantment", "&4An error occurred while loading mob.yml: Enchantment &6&v1&4 doesn't exist!"),
LOG_ERROR_MOBTYPE("Log_Error_MobType", "&4Error at loading mob.yml: Mob &6&v1&4 doesn't exist!"),
LOG_ERROR_NO_CONSOLE_COMMAND("Log_Error_NoConsoleCommand", "&6/dxl &v1&4 can not be executed as console!"),
LOG_ERROR_SIGN_SETUP("Log_Error_SignSetup", "&4A sign at &6&v1&4 is erroneous!"),

9
core/src/main/java/io/github/dre2n/dungeonsxl/dungeon/Dungeons.java
View File

@ -16,7 +16,8 @@
*/
package io.github.dre2n.dungeonsxl.dungeon;
import io.github.dre2n.dungeonsxl.DungeonsXL;
import io.github.dre2n.commons.util.messageutil.MessageUtil;
import io.github.dre2n.dungeonsxl.config.DMessages;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
@ -30,10 +31,6 @@ public class Dungeons {
private List<Dungeon> dungeons = new ArrayList<>();
public Dungeons() {
this(DungeonsXL.DUNGEONS);
}
public Dungeons(File folder) {
if (!folder.exists()) {
folder.mkdir();
@ -46,7 +43,7 @@ public class Dungeons {
dungeons.add(dungeon);
} else {
// debug
MessageUtil.log(DMessages.LOG_ERROR_DUNGEON_SETUP.getMessage(file.getName()));
}
}
}