Commit 54cc5ebd authored by Kenix Whisperwind's avatar Kenix Whisperwind

Removed an unused WorldLoader class instance member from World

parent c07e8b5b
......@@ -254,7 +254,7 @@ public final class SuperModerator implements CommandListener {
}
player.message(messagePrefix + "Drop tables reloaded");
} else if (cmd.equalsIgnoreCase("reloadworld") || cmd.equalsIgnoreCase("reloadland")) {
World.getWorld().wl.loadWorld(World.getWorld());
World.getWorld().getWorldLoader().loadWorld(World.getWorld());
player.message(messagePrefix + "World Reloaded");
} else if (cmd.equalsIgnoreCase("summonall")) {
if (args.length == 1) {
......
......@@ -69,7 +69,6 @@ public final class World implements SimpleSubscriber<FishingTrawler> {
public static int EVENT_COMBAT_MIN, EVENT_COMBAT_MAX;
public static boolean WORLD_TELEGRAB_TOGGLE = false;
private static World worldInstance;
private final WorldLoader db = new WorldLoader();
private final EntityList<Npc> npcs = new EntityList<Npc>(4000);
private final EntityList<Player> players = new EntityList<Player>(2000);
private final List<QuestInterface> quests = new LinkedList<QuestInterface>();
......@@ -77,7 +76,7 @@ public final class World implements SimpleSubscriber<FishingTrawler> {
private final List<Shop> shopData = new ArrayList<Shop>();
private final List<Shop> shops = new ArrayList<Shop>();
private final TileValue[][] tiles = new TileValue[MAX_WIDTH][MAX_HEIGHT];
public WorldLoader wl;
private WorldLoader worldLoader;
private Map<Player, Boolean> playerUnderAttackMap = new HashMap<Player, Boolean>();
private Map<Npc, Boolean> npcUnderAttackMap = new HashMap<Npc, Boolean>();
......@@ -220,10 +219,6 @@ public final class World implements SimpleSubscriber<FishingTrawler> {
this.delayedSpawnObject(loc, respawnTime, false);
}
public WorldLoader getDB() {
return db;
}
public Npc getNpc(int idx) {
try {
return npcs.get(idx);
......@@ -395,8 +390,8 @@ public final class World implements SimpleSubscriber<FishingTrawler> {
try {
ClanManager.init();
PartyManager.init();
worldInstance.wl = new WorldLoader();
worldInstance.wl.loadWorld(worldInstance);
worldInstance.worldLoader = new WorldLoader();
worldInstance.getWorldLoader().loadWorld(worldInstance);
WorldPopulation.populateWorld(worldInstance);
shutdownCheck();
if (Server.getServer().getConfig().WANT_NEW_RARE_DROP_TABLES)
......@@ -925,4 +920,7 @@ public final class World implements SimpleSubscriber<FishingTrawler> {
}
public WorldLoader getWorldLoader() {
return worldLoader;
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment