diff --git a/2006Redone Server/gradle/wrapper/gradle-wrapper.jar b/2006Redone Server/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 00000000..28861d27 Binary files /dev/null and b/2006Redone Server/gradle/wrapper/gradle-wrapper.jar differ diff --git a/2006Redone Server/gradle/wrapper/gradle-wrapper.properties b/2006Redone Server/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..115e6ac0 --- /dev/null +++ b/2006Redone Server/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/2006Redone Server/gradlew b/2006Redone Server/gradlew new file mode 100755 index 00000000..cccdd3d5 --- /dev/null +++ b/2006Redone Server/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/2006Redone Server/gradlew.bat b/2006Redone Server/gradlew.bat new file mode 100644 index 00000000..e95643d6 --- /dev/null +++ b/2006Redone Server/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/2006Redone Server/src/redone/Connection.java b/2006Redone Server/src/redone/Connection.java index e3b9d62e..c2abecfb 100644 --- a/2006Redone Server/src/redone/Connection.java +++ b/2006Redone Server/src/redone/Connection.java @@ -70,12 +70,12 @@ public class Connection { public static void unMuteUser(String name) { mutedNames.remove(name); - deleteFromFile("./Data/bans/UsersMuted.txt", name); + deleteFromFile("./data/bans/UsersMuted.txt", name); } public static void unIPMuteUser(String name) { mutedIps.remove(name); - deleteFromFile("./Data/bans/IpsMuted.txt", name); + deleteFromFile("./data/bans/IpsMuted.txt", name); } /** @@ -124,12 +124,12 @@ public class Connection { **/ public static void removeNameFromBanList(String name) { bannedNames.remove(name.toLowerCase()); - deleteFromFile("./Data/bans/UsersBanned.txt", name); + deleteFromFile("./data/bans/UsersBanned.txt", name); } public static void removeNameFromMuteList(String name) { bannedNames.remove(name.toLowerCase()); - deleteFromFile("./Data/bans/UsersMuted.txt", name); + deleteFromFile("./data/bans/UsersMuted.txt", name); } public static void deleteFromFile(String file, String name) { @@ -175,7 +175,7 @@ public class Connection { public static void banUsers() { try { BufferedReader in = new BufferedReader(new FileReader( - "./Data/bans/UsersBanned.txt")); + "./data/bans/UsersBanned.txt")); String data = null; try { while ((data = in.readLine()) != null) { @@ -192,7 +192,7 @@ public class Connection { public static void muteUsers() { try { BufferedReader in = new BufferedReader(new FileReader( - "./Data/bans/UsersMuted.txt")); + "./data/bans/UsersMuted.txt")); String data = null; try { while ((data = in.readLine()) != null) { @@ -212,7 +212,7 @@ public class Connection { public static void banIps() { try { BufferedReader in = new BufferedReader(new FileReader( - "./Data/bans/IpsBanned.txt")); + "./data/bans/IpsBanned.txt")); String data = null; try { while ((data = in.readLine()) != null) { @@ -229,7 +229,7 @@ public class Connection { public static void muteIps() { try { BufferedReader in = new BufferedReader(new FileReader( - "./Data/bans/IpsMuted.txt")); + "./data/bans/IpsMuted.txt")); String data = null; try { while ((data = in.readLine()) != null) { @@ -250,7 +250,7 @@ public class Connection { public static void addNameToFile(String Name) { try { BufferedWriter out = new BufferedWriter(new FileWriter( - "./Data/bans/UsersBanned.txt", true)); + "./data/bans/UsersBanned.txt", true)); try { out.newLine(); out.write(Name); @@ -265,7 +265,7 @@ public class Connection { public static void addUserToFile(String Name) { try { BufferedWriter out = new BufferedWriter(new FileWriter( - "./Data/bans/UsersMuted.txt", true)); + "./data/bans/UsersMuted.txt", true)); try { out.newLine(); out.write(Name); @@ -283,7 +283,7 @@ public class Connection { public static void addIpToFile(String Name) { try { BufferedWriter out = new BufferedWriter(new FileWriter( - "./Data/bans/IpsBanned.txt", true)); + "./data/bans/IpsBanned.txt", true)); try { out.newLine(); out.write(Name); @@ -298,7 +298,7 @@ public class Connection { public static void addIpToMuteFile(String Name) { try { BufferedWriter out = new BufferedWriter(new FileWriter( - "./Data/bans/IpsMuted.txt", true)); + "./data/bans/IpsMuted.txt", true)); try { out.newLine(); out.write(Name); diff --git a/2006Redone Server/src/redone/game/items/Item.java b/2006Redone Server/src/redone/game/items/Item.java index d3216f24..f829efb5 100644 --- a/2006Redone Server/src/redone/game/items/Item.java +++ b/2006Redone Server/src/redone/game/items/Item.java @@ -207,7 +207,7 @@ public class Item { int c; try { - FileInputStream dataIn = new FileInputStream(new File("./Data/data/stackable.dat")); + FileInputStream dataIn = new FileInputStream(new File("./data/data/stackable.dat")); while ((c = dataIn.read()) != -1) { if (c == 0) { itemStackable[counter] = false; @@ -225,7 +225,7 @@ public class Item { counter = 0; try { - FileInputStream dataIn = new FileInputStream(new File("./Data/data/notes.dat")); + FileInputStream dataIn = new FileInputStream(new File("./data/data/notes.dat")); while ((c = dataIn.read()) != -1) { if (c == 0) { itemIsNote[counter] = true; @@ -242,7 +242,7 @@ public class Item { counter = 0; try { - FileInputStream dataIn = new FileInputStream(new File("./Data/data/equipment.dat")); + FileInputStream dataIn = new FileInputStream(new File("./data/data/equipment.dat")); while ((c = dataIn.read()) != -1) { targetSlots[counter++] = c; } diff --git a/2006Redone Server/src/redone/game/items/ItemDefinitions.java b/2006Redone Server/src/redone/game/items/ItemDefinitions.java index 576a05fb..cfdde90d 100644 --- a/2006Redone Server/src/redone/game/items/ItemDefinitions.java +++ b/2006Redone Server/src/redone/game/items/ItemDefinitions.java @@ -44,7 +44,7 @@ public class ItemDefinitions { */ public static void read() { try { - DataInputStream in = new DataInputStream(new FileInputStream("./Data/data/itemdef.gsu")); + DataInputStream in = new DataInputStream(new FileInputStream("./data/data/itemdef.gsu")); total = in.readShort(); if(definitions == null) definitions = new ItemDefinitions[total]; diff --git a/2006Redone Server/src/redone/game/npcs/NpcHandler.java b/2006Redone Server/src/redone/game/npcs/NpcHandler.java index 2d79e896..d9b130d5 100644 --- a/2006Redone Server/src/redone/game/npcs/NpcHandler.java +++ b/2006Redone Server/src/redone/game/npcs/NpcHandler.java @@ -39,8 +39,8 @@ public class NpcHandler { for (int i = 0; i < maxListedNPCs; i++) { NpcList[i] = null; } - loadNPCList("./Data/CFG/npc.cfg"); - loadAutoSpawn("./Data/CFG/spawn-config.cfg"); + loadNPCList("./data/CFG/npc.cfg"); + loadAutoSpawn("./data/CFG/spawn-config.cfg"); } public static boolean isUndead(int index) { diff --git a/2006Redone Server/src/redone/game/players/PlayerSave.java b/2006Redone Server/src/redone/game/players/PlayerSave.java index 0ce69657..e4d0172f 100644 --- a/2006Redone Server/src/redone/game/players/PlayerSave.java +++ b/2006Redone Server/src/redone/game/players/PlayerSave.java @@ -27,7 +27,7 @@ public class PlayerSave { try { characterfile = new BufferedReader(new FileReader( - "./Data/characters/" + playerName + ".txt")); + "./data/characters/" + playerName + ".txt")); File1 = true; } catch (FileNotFoundException fileex1) { } @@ -373,7 +373,7 @@ public class PlayerSave { BufferedWriter characterfile = null; try { characterfile = new BufferedWriter(new FileWriter( - "./Data/characters/" + player.playerName + ".txt")); + "./data/characters/" + player.playerName + ".txt")); /* ACCOUNT */ characterfile.write("[ACCOUNT]", 0, 9); diff --git a/2006Redone Server/src/redone/game/shops/ShopHandler.java b/2006Redone Server/src/redone/game/shops/ShopHandler.java index a54b408d..8c93d48f 100644 --- a/2006Redone Server/src/redone/game/shops/ShopHandler.java +++ b/2006Redone Server/src/redone/game/shops/ShopHandler.java @@ -114,7 +114,7 @@ public class ShopHandler { boolean EndOfFile = false; BufferedReader characterfile = null; try { - characterfile = new BufferedReader(new FileReader("./Data/CFG/" + FileName)); + characterfile = new BufferedReader(new FileReader("./data/CFG/" + FileName)); } catch (FileNotFoundException fileex) { Misc.println(FileName + ": file not found."); return false; diff --git a/2006Redone Server/src/redone/util/GameLogger.java b/2006Redone Server/src/redone/util/GameLogger.java index d57d977a..0eb3542f 100644 --- a/2006Redone Server/src/redone/util/GameLogger.java +++ b/2006Redone Server/src/redone/util/GameLogger.java @@ -59,37 +59,37 @@ public class GameLogger { public static void writeLog(String player, String logType, String data) { File log = null; if (logType.equalsIgnoreCase("alchemy")) { - log = new File("./Data/logs/alchlogs/" + player + ".txt"); + log = new File("./data/logs/alchlogs/" + player + ".txt"); } else if (logType.equalsIgnoreCase("shopselling")) { - log = new File("./Data/logs/shopselling/" + player + ".txt"); + log = new File("./data/logs/shopselling/" + player + ".txt"); } else if (logType.equalsIgnoreCase("shopbuying")) { - log = new File("./Data/logs/shopbuying/" + player + ".txt"); + log = new File("./data/logs/shopbuying/" + player + ".txt"); } else if (logType.equalsIgnoreCase("dropitem")) { - log = new File("./Data/logs/dropitem/" + player + ".txt"); + log = new File("./data/logs/dropitem/" + player + ".txt"); } else if (logType.equalsIgnoreCase("clickitem")) { - log = new File("./Data/logs/clickitem/" + player + ".txt"); + log = new File("./data/logs/clickitem/" + player + ".txt"); } else if (logType.equalsIgnoreCase("pickupitem")) { - log = new File("./Data/logs/pickupitem/" + player + ".txt"); + log = new File("./data/logs/pickupitem/" + player + ".txt"); } else if (logType.equalsIgnoreCase("commands")) { - log = new File("./Data/logs/commands/" + player + ".txt"); + log = new File("./data/logs/commands/" + player + ".txt"); } else if (logType.equalsIgnoreCase("pmsent")) { - log = new File("./Data/logs/privatemessages/pmsent/" + player + ".txt"); + log = new File("./data/logs/privatemessages/pmsent/" + player + ".txt"); } else if (logType.equalsIgnoreCase("pmrecieved")) { - log = new File("./Data/logs/privatemessages/pmrecieved/" + player + ".txt"); + log = new File("./data/logs/privatemessages/pmrecieved/" + player + ".txt"); } else if (logType.equalsIgnoreCase("tradesgave")) { - log = new File("./Data/logs/trades/gave/" + player + ".txt"); + log = new File("./data/logs/trades/gave/" + player + ".txt"); } else if (logType.equalsIgnoreCase("tradesrecieved")) { - log = new File("./Data/logs/trades/recieved/" + player + ".txt"); + log = new File("./data/logs/trades/recieved/" + player + ".txt"); } else if (logType.equalsIgnoreCase("pkingkilled")) { - log = new File("./Data/logs/pking/killed/" + player + ".txt"); + log = new File("./data/logs/pking/killed/" + player + ".txt"); } else if (logType.equalsIgnoreCase("pkingkiller")) { - log = new File("./Data/logs/pking/killer/" + player + ".txt"); + log = new File("./data/logs/pking/killer/" + player + ".txt"); } else if (logType.equalsIgnoreCase("duelingkilled")) { - log = new File("./Data/logs/dueling/killed/" + player + ".txt"); + log = new File("./data/logs/dueling/killed/" + player + ".txt"); } else if (logType.equalsIgnoreCase("duelingkiller")) { - log = new File("./Data/logs/dueling/killer/" + player + ".txt"); + log = new File("./data/logs/dueling/killer/" + player + ".txt"); } else { - log = new File("./Data/logs/" + player + ".txt"); + log = new File("./data/logs/" + player + ".txt"); } if (!log.exists()) { diff --git a/2006Redone Server/src/redone/world/GlobalDropsHandler.java b/2006Redone Server/src/redone/world/GlobalDropsHandler.java index 21448565..70998e77 100644 --- a/2006Redone Server/src/redone/world/GlobalDropsHandler.java +++ b/2006Redone Server/src/redone/world/GlobalDropsHandler.java @@ -38,7 +38,7 @@ public class GlobalDropsHandler { BufferedReader Checker; try { Checker = new BufferedReader(new FileReader( - "./Data/cfg/globaldrops.txt")); + "./data/cfg/globaldrops.txt")); while ((Data = Checker.readLine()) != null) { if (Data.startsWith("#")) { continue; diff --git a/2006Redone Server/src/redone/world/ItemHandler.java b/2006Redone Server/src/redone/world/ItemHandler.java index fd524c00..969dcd1e 100644 --- a/2006Redone Server/src/redone/world/ItemHandler.java +++ b/2006Redone Server/src/redone/world/ItemHandler.java @@ -369,7 +369,7 @@ public int itemAmount(String name, int itemId, int itemX, int itemY) { boolean EndOfFile = false; BufferedReader characterfile = null; try { - characterfile = new BufferedReader(new FileReader("./Data/cfg/" + characterfile = new BufferedReader(new FileReader("./data/cfg/" + FileName)); } catch (FileNotFoundException fileex) { Misc.println(FileName + ": file not found."); diff --git a/2006Redone Server/src/redone/world/ObjectHandler.java b/2006Redone Server/src/redone/world/ObjectHandler.java index ef604144..18d6e284 100644 --- a/2006Redone Server/src/redone/world/ObjectHandler.java +++ b/2006Redone Server/src/redone/world/ObjectHandler.java @@ -28,8 +28,8 @@ public class ObjectHandler { public static List removedObjects = new ArrayList(); public ObjectHandler() { - loadGlobalObjects("./Data/cfg/global-objects.cfg"); - // Ladders.loadGlobalLadders("./Data/Ladders/AdvancedLadders.cfg"); + loadGlobalObjects("./data/cfg/global-objects.cfg"); + // Ladders.loadGlobalLadders("./data/Ladders/AdvancedLadders.cfg"); } public Objects getObjectByPosition(int x, int y) { diff --git a/2006Redone Server/src/redone/world/clip/ObjectDef.java b/2006Redone Server/src/redone/world/clip/ObjectDef.java index 3dc12f1d..02326f7e 100644 --- a/2006Redone Server/src/redone/world/clip/ObjectDef.java +++ b/2006Redone Server/src/redone/world/clip/ObjectDef.java @@ -59,7 +59,7 @@ public final class ObjectDef { public static byte[] getBuffer(String s) { try { - java.io.File f = new java.io.File("./Data/world/object/" + s); + java.io.File f = new java.io.File("./data/world/object/" + s); if (!f.exists()) { return null; } diff --git a/2006Redone Server/src/redone/world/clip/Region.java b/2006Redone Server/src/redone/world/clip/Region.java index ed8460c8..a30573bc 100644 --- a/2006Redone Server/src/redone/world/clip/Region.java +++ b/2006Redone Server/src/redone/world/clip/Region.java @@ -394,7 +394,7 @@ public class Region { public static void load() { try { - File f = new File("./Data/world/map_index"); + File f = new File("./data/world/map_index"); byte[] buffer = new byte[(int) f.length()]; DataInputStream dis = new DataInputStream(new FileInputStream(f)); dis.readFully(buffer); @@ -416,9 +416,9 @@ public class Region { regions[i] = new Region(regionIds[i], isMembers[i]); } for (int i = 0; i < size; i++) { - byte[] file1 = getBuffer(new File("./Data/world/map/" + byte[] file1 = getBuffer(new File("./data/world/map/" + mapObjectsFileIds[i] + ".gz")); - byte[] file2 = getBuffer(new File("./Data/world/map/" + byte[] file2 = getBuffer(new File("./data/world/map/" + mapGroundFileIds[i] + ".gz")); if (file1 == null || file2 == null) { continue;