projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-10-05 20:13:20 -04:00
Code Issues Projects Releases Wiki Activity

Added galaxy name to the player class

Browse Source
This commit is contained in:
Obique PSWG
2015-06-14 10:37:03 -05:00
parent 6b6b76c04c
commit 313e72e658
3 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/player/PlayerManager.java
+7 -4
View File
@@ -175,7 +175,7 @@ public class PlayerManager extends Manager {
}
}
private Player transitionLoginToZone(final long networkId, final int galaxyId, ClientIdMsg clientId) {
private Player transitionLoginToZone(long networkId, int galaxyId, String galaxyName, ClientIdMsg clientId) {
final byte [] nToken = clientId.getSessionToken();
synchronized (players) {
for (Player p : players.values()) {
@@ -191,6 +191,7 @@ public class PlayerManager extends Manager {
players.remove(p.getNetworkId());
p.setNetworkId(networkId);
p.setGalaxyId(galaxyId);
p.setGalaxyName(galaxyName);
players.put(networkId, p);
Log.i("PlayerManager", "Transitioned %s from login to zone", p.getUsername());
return p;
@@ -222,9 +223,11 @@ public class PlayerManager extends Manager {
ServerType type = gpi.getServerType();
long networkId = gpi.getNetworkId();
Player player = null;
if (type == ServerType.ZONE && packet instanceof ClientIdMsg)
player = transitionLoginToZone(networkId, gpi.getGalaxy().getId(), (ClientIdMsg) packet);
else
if (type == ServerType.ZONE && packet instanceof ClientIdMsg) {
String galaxyName = gpi.getGalaxy().getName();
int galaxyId = gpi.getGalaxy().getId();
player = transitionLoginToZone(networkId, galaxyId, galaxyName, (ClientIdMsg) packet);
} else
player = getPlayerFromNetworkId(networkId);
if (player != null && type == ServerType.ZONE && packet instanceof SelectCharacter)
removeDuplicatePlayers(player, ((SelectCharacter)packet).getCharacterId());