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

Code improvements.

Browse Source
This commit is contained in:
MobiusDev
2016-04-24 16:30:15 +00:00
parent 8bd51aba1c
commit 2dd14bef9b
860 changed files with 8865 additions and 17041 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
trunk/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangePassword.java
View File

@@ -73,8 +73,7 @@ public class ChangePassword extends BaseRecievePacket
{
final MessageDigest md = MessageDigest.getInstance("SHA");
byte[] raw = curpass.getBytes("UTF-8");
raw = md.digest(raw);
final byte[] raw = md.digest(curpass.getBytes("UTF-8"));
final String curpassEnc = Base64.getEncoder().encodeToString(raw);
String pass = null;
int passUpdated = 0;
@@ -95,9 +94,7 @@ public class ChangePassword extends BaseRecievePacket
if (curpassEnc.equals(pass))
{
byte[] password = newpass.getBytes("UTF-8");
password = md.digest(password);
final byte[] password = md.digest(newpass.getBytes("UTF-8"));
// SQL connection
try (Connection con = DatabaseFactory.getInstance().getConnection();
PreparedStatement ps = con.prepareStatement("UPDATE accounts SET password=? WHERE login=?"))

57
trunk/java/com/l2jmobius/loginserver/network/gameserverpackets/GameServerAuth.java
View File

@@ -65,8 +65,8 @@ public class GameServerAuth extends BaseRecievePacket
super(decrypt);
_server = server;
_desiredId = readC();
_acceptAlternativeId = (readC() == 0 ? false : true);
_hostReserved = (readC() == 0 ? false : true);
_acceptAlternativeId = readC() != 0;
_hostReserved = readC() != 0;
_port = readH();
_maxPlayers = readD();
int size = readD();
@@ -123,53 +123,36 @@ public class GameServerAuth extends BaseRecievePacket
}
else
{
// there is already a server registered with the desired id and different hex id
// try to register this one with an alternative id
if (Config.ACCEPT_NEW_GAMESERVER && _acceptAlternativeId)
if (!Config.ACCEPT_NEW_GAMESERVER || !_acceptAlternativeId)
{
gsi = new GameServerInfo(id, hexId, _server);
if (gameServerTable.registerWithFirstAvailableId(gsi))
{
_server.attachGameServerInfo(gsi, _port, _hosts, _maxPlayers);
gameServerTable.registerServerOnDB(gsi);
}
else
{
_server.forceClose(LoginServerFail.REASON_NO_FREE_ID);
return false;
}
}
else
{
// server id is already taken, and we cant get a new one for you
_server.forceClose(LoginServerFail.REASON_WRONG_HEXID);
return false;
}
gsi = new GameServerInfo(id, hexId, _server);
if (!gameServerTable.registerWithFirstAvailableId(gsi))
{
_server.forceClose(LoginServerFail.REASON_NO_FREE_ID);
return false;
}
_server.attachGameServerInfo(gsi, _port, _hosts, _maxPlayers);
gameServerTable.registerServerOnDB(gsi);
}
}
else
{
// can we register on this id?
if (Config.ACCEPT_NEW_GAMESERVER)
{
gsi = new GameServerInfo(id, hexId, _server);
if (gameServerTable.register(id, gsi))
{
_server.attachGameServerInfo(gsi, _port, _hosts, _maxPlayers);
gameServerTable.registerServerOnDB(gsi);
}
else
{
// some one took this ID meanwhile
_server.forceClose(LoginServerFail.REASON_ID_RESERVED);
return false;
}
}
else
if (!Config.ACCEPT_NEW_GAMESERVER)
{
_server.forceClose(LoginServerFail.REASON_WRONG_HEXID);
return false;
}
gsi = new GameServerInfo(id, hexId, _server);
if (!gameServerTable.register(id, gsi))
{
_server.forceClose(LoginServerFail.REASON_ID_RESERVED);
return false;
}
_server.attachGameServerInfo(gsi, _port, _hosts, _maxPlayers);
gameServerTable.registerServerOnDB(gsi);
}
return true;

2
trunk/java/com/l2jmobius/loginserver/network/gameserverpackets/RequestTempBan.java
View File

@@ -48,7 +48,7 @@ public class RequestTempBan extends BaseRecievePacket
_accountName = readS();
_ip = readS();
_banTime = readQ();
final boolean haveReason = readC() == 0 ? false : true;
final boolean haveReason = readC() != 0;
if (haveReason)
{
_banReason = readS();

64
trunk/java/com/l2jmobius/loginserver/network/gameserverpackets/ServerStatus.java
View File

@@ -71,40 +71,42 @@ public class ServerStatus extends BaseRecievePacket
super(decrypt);
final GameServerInfo gsi = GameServerTable.getInstance().getRegisteredGameServerById(server.getServerId());
if (gsi != null)
if (gsi == null)
{
final int size = readD();
for (int i = 0; i < size; i++)
return;
}
final int size = readD();
for (int i = 0; i < size; i++)
{
final int type = readD();
final int value = readD();
switch (type)
{
final int type = readD();
final int value = readD();
switch (type)
case SERVER_LIST_STATUS:
{
case SERVER_LIST_STATUS:
{
gsi.setStatus(value);
break;
}
case SERVER_LIST_SQUARE_BRACKET:
{
gsi.setShowingBrackets(value == ON);
break;
}
case MAX_PLAYERS:
{
gsi.setMaxPlayers(value);
break;
}
case SERVER_TYPE:
{
gsi.setServerType(value);
break;
}
case SERVER_AGE:
{
gsi.setAgeLimit(value);
break;
}
gsi.setStatus(value);
break;
}
case SERVER_LIST_SQUARE_BRACKET:
{
gsi.setShowingBrackets(value == ON);
break;
}
case MAX_PLAYERS:
{
gsi.setMaxPlayers(value);
break;
}
case SERVER_TYPE:
{
gsi.setServerType(value);
break;
}
case SERVER_AGE:
{
gsi.setAgeLimit(value);
break;
}
}
}