Sweetgum/sweetgum-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Consistent handling of wz files and their paths

Browse Source
This commit is contained in:
P0nk
2021-07-10 17:37:24 +02:00
parent 2193057fce
commit 14a405adb2
27 changed files with 106 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/server/maps/MapleMapFactory.java
View File

@@ -25,6 +25,7 @@ import provider.MapleData;
import provider.MapleDataProvider;
import provider.MapleDataProviderFactory;
import provider.MapleDataTool;
import provider.wz.WZFiles;
import scripting.event.EventInstanceManager;
import server.life.*;
import server.partyquest.GuardianSpawnPoint;
@@ -32,7 +33,6 @@ import tools.DatabaseConnection;
import tools.StringUtil;
import java.awt.*;
import java.io.File;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
@@ -47,8 +47,8 @@ public class MapleMapFactory {
private static MapleDataProvider mapSource;
static {
nameData = MapleDataProviderFactory.getDataProvider(new File(System.getProperty("wzpath") + "/String.wz")).getData("Map.img");
mapSource = MapleDataProviderFactory.getDataProvider(new File(System.getProperty("wzpath") + "/Map.wz"));
nameData = MapleDataProviderFactory.getDataProvider(WZFiles.STRING).getData("Map.img");
mapSource = MapleDataProviderFactory.getDataProvider(WZFiles.MAP);
}
private static void loadLifeFromWz(MapleMap map, MapleData mapData) {

4
src/main/java/server/maps/MapleReactorFactory.java
View File

@@ -25,18 +25,18 @@ import provider.MapleData;
import provider.MapleDataProvider;
import provider.MapleDataProviderFactory;
import provider.MapleDataTool;
import provider.wz.WZFiles;
import server.maps.MapleReactorStats.StateData;
import tools.Pair;
import tools.StringUtil;
import java.io.File;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class MapleReactorFactory {
private static MapleDataProvider data = MapleDataProviderFactory.getDataProvider(new File(System.getProperty("wzpath") + "/Reactor.wz"));
private static MapleDataProvider data = MapleDataProviderFactory.getDataProvider(WZFiles.REACTOR);
private static Map<Integer, MapleReactorStats> reactorStats = new HashMap<>();