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

Sync with L2JServer Jan 9th 2015.

Browse Source
This commit is contained in:
mobius
2015-01-09 19:55:02 +00:00
parent 9c9b0aaff7
commit 4c2db62a63
618 changed files with 19803 additions and 7853 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
trunk/java/com/l2jserver/loginserver/GameServerTable.java
View File

@@ -34,7 +34,6 @@ import java.sql.Statement;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
import java.util.logging.Logger;
import javolution.io.UTF8StreamReader;
@@ -185,17 +184,17 @@ public final class GameServerTable
* @param gsi the game server information DTO
* @return true, if successful
*/
public boolean registerWithFirstAvaliableId(GameServerInfo gsi)
public boolean registerWithFirstAvailableId(GameServerInfo gsi)
{
// avoid two servers registering with the same "free" id
synchronized (_gameServerTable)
{
for (Entry<Integer, String> entry : _serverNames.entrySet())
for (Integer serverId : _serverNames.keySet())
{
if (!_gameServerTable.containsKey(entry.getKey()))
if (!_gameServerTable.containsKey(serverId))
{
_gameServerTable.put(entry.getKey(), gsi);
gsi.setId(entry.getKey());
_gameServerTable.put(serverId, gsi);
gsi.setId(serverId);
return true;
}
}
@@ -217,7 +216,6 @@ public final class GameServerTable
if (!_gameServerTable.containsKey(id))
{
_gameServerTable.put(id, gsi);
gsi.setId(id);
return true;
}
}
@@ -381,6 +379,12 @@ public final class GameServerTable
return _hexId;
}
public String getName()
{
// this value can't be stored in a private variable because the ID can be changed by setId()
return GameServerTable.getInstance().getServerNameById(_id);
}
/**
* Sets the authed.
* @param isAuthed the new authed
@@ -435,6 +439,20 @@ public final class GameServerTable
return _status;
}
public String getStatusName()
{
switch (_status)
{
case 0: return "Auto";
case 1: return "Good";
case 2: return "Normal";
case 3: return "Full";
case 4: return "Down";
case 5: return "GM Only";
default: return "Unknown";
}
}
/**
* Gets the current player count.
* @return the current player count