moparisthebest
/
MoparClassic
mirror of https://github.com/moparisthebest/MoparClassic
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed various errors.

This commit is contained in:
Joe0 2011-12-19 00:27:59 -06:00
parent 0145a249a8
commit 7629871bc7
6 changed files with 65 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
GameServer/src/org/moparscape/msc/gs/Server.java
View File

@ -49,7 +49,12 @@ public class Server {
Config.initConfig(configFile); Config.initConfig(configFile);
world = Instance.getWorld(); world = Instance.getWorld();
world.wl.loadObjects(); try {
world.wl.loadObjects();
} catch (Exception e) {
e.printStackTrace();
System.exit(0);
}
World.initilizeDB(); World.initilizeDB();

10
GameServer/src/org/moparscape/msc/gs/core/GameEngine.java
View File

@ -91,7 +91,12 @@ public final class GameEngine extends Thread {
captcha = new Captcha(); captcha = new Captcha();
captcha.init(); captcha.init();
packetQueue = new PacketQueue<RSCPacket>(); packetQueue = new PacketQueue<RSCPacket>();
loadPacketHandlers(); try {
loadPacketHandlers();
} catch (Exception e) {
e.printStackTrace();
System.exit(0);
}
for (Shop shop : world.getShops()) { for (Shop shop : world.getShops()) {
shop.initRestock(); shop.initRestock();
} }
@ -146,8 +151,9 @@ public final class GameEngine extends Thread {
/** /**
* Loads the packet handling classes from the persistence manager. * Loads the packet handling classes from the persistence manager.
* @throws Exception
*/ */
protected void loadPacketHandlers() { protected void loadPacketHandlers() throws Exception {
PacketHandlerDef[] handlerDefs = Instance.getDataStore() PacketHandlerDef[] handlerDefs = Instance.getDataStore()
.loadPacketHandlerDefs(); .loadPacketHandlerDefs();
for (PacketHandlerDef handlerDef : handlerDefs) { for (PacketHandlerDef handlerDef : handlerDefs) {

9
GameServer/src/org/moparscape/msc/gs/core/LoginConnector.java
View File

@ -112,7 +112,12 @@ public class LoginConnector {
public LoginConnector() { public LoginConnector() {
packetQueue = new PacketQueue<LSPacket>(); packetQueue = new PacketQueue<LSPacket>();
loadPacketHandlers(); try {
loadPacketHandlers();
} catch (Exception e) {
e.printStackTrace();
System.exit(0);
}
reconnect(); reconnect();
} }
@ -138,7 +143,7 @@ public class LoginConnector {
actionSender.unregisterWorld(); actionSender.unregisterWorld();
} }
private void loadPacketHandlers() { private void loadPacketHandlers() throws Exception {
PacketHandlerDef[] handlerDefs = Instance.getDataStore().loadLSPacketHandlerDefs(); PacketHandlerDef[] handlerDefs = Instance.getDataStore().loadLSPacketHandlerDefs();
for (PacketHandlerDef handlerDef : handlerDefs) { for (PacketHandlerDef handlerDef : handlerDefs) {
try { try {

75
GameServer/src/org/moparscape/msc/gs/external/EntityHandler.java vendored
View File

@ -52,43 +52,48 @@ public class EntityHandler {
static { static {
DataStore dataStore = Instance.getDataStore(); DataStore dataStore = Instance.getDataStore();
doors = dataStore.loadDoorDefs(); try {
gameObjects = dataStore.loadGameObjectDefs(); doors = dataStore.loadDoorDefs();
npcs = dataStore.loadNPCDefs(); gameObjects = dataStore.loadGameObjectDefs();
for (NPCDef n : npcs) { npcs = dataStore.loadNPCDefs();
if (n.isAttackable()) { for (NPCDef n : npcs) {
n.respawnTime -= (n.respawnTime / 3); if (n.isAttackable()) {
n.respawnTime -= (n.respawnTime / 3);
}
} }
prayers = dataStore.loadPrayerDefs();
items = dataStore.loadItemDefs();
spells = dataStore.loadSpellDefs();
tiles = dataStore.loadTileDefs();
keyChestLoots = dataStore.loadKeyChestLoots();
herbSeconds = dataStore.loadItemHerbSeconds();
dartTips = dataStore.loadDartTips();
gems = dataStore.loadGemDefs();
logCut = dataStore.loadItemLogCutDefs();
bowString = dataStore.loadItemBowStringDefs();
arrowHeads = dataStore.loadItemArrowHeadDefs();
firemaking = dataStore.loadFiremakingDefs();
itemAffectedTypes = dataStore.loadItemAffectedTypes();
itemWieldable = dataStore.loadItemWieldableDefs();
itemUnIdentHerb = dataStore.loadItemUnIdentHerbDefs();
itemHerb = dataStore.loadItemHerbDefs();
itemEdibleHeals = dataStore.loadItemEdibleHeals();
itemCooking = dataStore.loadItemCookingDefs();
itemSmelting = dataStore.loadItemSmeltingDefs();
itemSmithing = dataStore.loadItemSmithingDefs();
itemCrafting = dataStore.loadItemCraftingDefs();
objectMining = dataStore.loadObjectMiningDefs();
objectWoodcutting = dataStore.loadObjectWoodcuttingDefs();
objectFishing = dataStore.loadObjectFishDefs();
spellAggressiveLvl = dataStore.loadSpellAgressiveLevel();
objectTelePoints = dataStore.loadTelePoints();
certers = dataStore.loadCerterDefs();
agilityObjects = dataStore.loadAgilityDefs();
agilityCourses = dataStore.loadAgilityCourseDefs();
} catch (Exception e) {
e.printStackTrace();
System.exit(0);
} }
prayers = dataStore.loadPrayerDefs();
items = dataStore.loadItemDefs();
spells = dataStore.loadSpellDefs();
tiles = dataStore.loadTileDefs();
keyChestLoots = dataStore.loadKeyChestLoots();
herbSeconds = dataStore.loadItemHerbSeconds();
dartTips = dataStore.loadDartTips();
gems = dataStore.loadGemDefs();
logCut = dataStore.loadItemLogCutDefs();
bowString = dataStore.loadItemBowStringDefs();
arrowHeads = dataStore.loadItemArrowHeadDefs();
firemaking = dataStore.loadFiremakingDefs();
itemAffectedTypes = dataStore.loadItemAffectedTypes();
itemWieldable = dataStore.loadItemWieldableDefs();
itemUnIdentHerb = dataStore.loadItemUnIdentHerbDefs();
itemHerb = dataStore.loadItemHerbDefs();
itemEdibleHeals = dataStore.loadItemEdibleHeals();
itemCooking = dataStore.loadItemCookingDefs();
itemSmelting = dataStore.loadItemSmeltingDefs();
itemSmithing = dataStore.loadItemSmithingDefs();
itemCrafting = dataStore.loadItemCraftingDefs();
objectMining = dataStore.loadObjectMiningDefs();
objectWoodcutting = dataStore.loadObjectWoodcuttingDefs();
objectFishing = dataStore.loadObjectFishDefs();
spellAggressiveLvl = dataStore.loadSpellAgressiveLevel();
objectTelePoints = dataStore.loadTelePoints();
certers = dataStore.loadCerterDefs();
agilityObjects = dataStore.loadAgilityDefs();
agilityCourses = dataStore.loadAgilityCourseDefs();
dataStore.dispose(); dataStore.dispose();
} }

4
GameServer/src/org/moparscape/msc/gs/io/WorldLoader.java
View File

@ -127,7 +127,7 @@ public class WorldLoader {
* } * }
*/ */
public void loadWorld(World world) { public void loadWorld(World world) throws Exception {
try { try {
tileArchive = new ZipFile(new File(Config.CONF_DIR, tileArchive = new ZipFile(new File(Config.CONF_DIR,
"data/Landscape.rscd")); "data/Landscape.rscd"));
@ -157,7 +157,7 @@ public class WorldLoader {
System.gc(); System.gc();
} }
public void loadObjects() { public void loadObjects() throws Exception {
World world = Instance.getWorld(); World world = Instance.getWorld();
for (GameObjectLoc gameObject : Instance.getDataStore().loadGameObjectLocs()) { for (GameObjectLoc gameObject : Instance.getDataStore().loadGameObjectLocs()) {
if (Config.f2pWildy && Formulae.isP2P(true, gameObject)) if (Config.f2pWildy && Formulae.isP2P(true, gameObject))

3
GameServer/src/org/moparscape/msc/gs/model/World.java
View File

@ -468,8 +468,9 @@ public final class World {
/** /**
* Loads the npc handling classes * Loads the npc handling classes
* @throws Exception
*/ */
private void loadNpcHandlers() { private void loadNpcHandlers() throws Exception {
NpcHandlerDef[] handlerDefs = Instance.getDataStore().loadNpcHandlers(); NpcHandlerDef[] handlerDefs = Instance.getDataStore().loadNpcHandlers();
for (NpcHandlerDef handlerDef : handlerDefs) { for (NpcHandlerDef handlerDef : handlerDefs) {