lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moved loginserver servaname XML file to data folder.

Browse Source
This commit is contained in:
MobiusDev
2017-07-20 08:43:25 +00:00
parent 5a7592db4e
commit 346d322601
5 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
L2J_Mobius_C4/dist/login/servername.xml → L2J_Mobius_C4/dist/login/data/servername.xml vendored
View File

0
L2J_Mobius_C4/dist/login/servername.xsd → L2J_Mobius_C4/dist/login/data/servername.xsd vendored
View File

2
L2J_Mobius_C4/java/com/l2jmobius/gameserver/script/faenor/FaenorScriptEngine.java
View File

@@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.script.Parser;
import com.l2jmobius.gameserver.script.ParserNotCreatedException; import com.l2jmobius.gameserver.script.ParserNotCreatedException;
import com.l2jmobius.gameserver.script.ScriptDocument; import com.l2jmobius.gameserver.script.ScriptDocument;
import com.l2jmobius.gameserver.script.ScriptEngine; import com.l2jmobius.gameserver.script.ScriptEngine;
import com.l2jmobius.gameserver.util.file.filter.XMLFilter; import com.l2jmobius.util.file.filter.XMLFilter;
/** /**
* @author Luis Arias * @author Luis Arias

11
L2J_Mobius_C4/java/com/l2jmobius/loginserver/GameServerTable.java
View File

@@ -137,7 +137,7 @@ public class GameServerTable
*/ */
private void loadServerNames() private void loadServerNames()
{ {
try (InputStream in = new FileInputStream("servername.xml"); try (InputStream in = new FileInputStream("data/servername.xml");
UTF8StreamReader utf8 = new UTF8StreamReader()) UTF8StreamReader utf8 = new UTF8StreamReader())
{ {
final XMLStreamReaderImpl xpp = new XMLStreamReaderImpl(); final XMLStreamReaderImpl xpp = new XMLStreamReaderImpl();
@@ -397,14 +397,7 @@ public class GameServerTable
Collections.sort(_gameServerList, gsComparator); Collections.sort(_gameServerList, gsComparator);
} }
private final Comparator<GameServer> gsComparator = new Comparator<GameServer>() private final Comparator<GameServer> gsComparator = (gs1, gs2) -> (gs1.server_id < gs2.server_id ? -1 : gs1.server_id == gs2.server_id ? 0 : 1);
{
@Override
public int compare(GameServer gs1, GameServer gs2)
{
return (gs1.server_id < gs2.server_id ? -1 : gs1.server_id == gs2.server_id ? 0 : 1);
}
};
/** /**
* @param thread * @param thread

2
L2J_Mobius_C4/java/com/l2jmobius/gameserver/util/file/filter/XMLFilter.java → L2J_Mobius_C4/java/com/l2jmobius/util/file/filter/XMLFilter.java
View File

@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.l2jmobius.gameserver.util.file.filter; package com.l2jmobius.util.file.filter;
import java.io.File; import java.io.File;
import java.io.FileFilter; import java.io.FileFilter;