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

Fixed CORE-92 'Login to same character twice'

Browse Source
This commit is contained in:
Obique
2015-05-17 20:14:10 -05:00
committed by Obique
parent d0f8163e8d
commit a4e5322c46
3 changed files with 130 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/galaxy/ConnectionService.java
+53 -25
View File
@@ -40,6 +40,7 @@ import network.packets.soe.Disconnect.DisconnectReason;
import network.packets.swg.zone.HeartBeatMessage;
import intents.PlayerEventIntent;
import intents.network.CloseConnectionIntent;
import intents.network.ForceDisconnectIntent;
import intents.network.GalacticPacketIntent;
import resources.control.Intent;
import resources.control.Service;
@@ -92,6 +93,7 @@ public class ConnectionService extends Service {
public boolean initialize() {
registerForIntent(PlayerEventIntent.TYPE);
registerForIntent(GalacticPacketIntent.TYPE);
registerForIntent(ForceDisconnectIntent.TYPE);
return super.initialize();
}
@@ -115,39 +117,59 @@ public class ConnectionService extends Service {
@Override
public void onIntentReceived(Intent i) {
if (i instanceof PlayerEventIntent) {
if (((PlayerEventIntent)i).getEvent() == PlayerEvent.PE_ZONE_IN) {
Player p = ((PlayerEventIntent)i).getPlayer();
if (i instanceof PlayerEventIntent)
onPlayerEventIntent((PlayerEventIntent) i);
else if (i instanceof GalacticPacketIntent)
onGalacticPacketIntent((GalacticPacketIntent) i);
else if (i instanceof ForceDisconnectIntent)
onForceDisconnectIntent((ForceDisconnectIntent) i);
}
private void onPlayerEventIntent(PlayerEventIntent pei) {
switch (pei.getEvent()) {
case PE_ZONE_IN: {
Player p = pei.getPlayer();
synchronized (zonedInPlayers) {
removeOld(p);
zonedInPlayers.add(p);
}
} else if (((PlayerEventIntent)i).getEvent() == PlayerEvent.PE_DISAPPEAR) {
synchronized (zonedInPlayers) {
zonedInPlayers.remove(((PlayerEventIntent)i).getPlayer());
}
break;
}
} else if (i instanceof GalacticPacketIntent) {
if (((GalacticPacketIntent)i).getPacket() instanceof HeartBeatMessage) {
GalacticPacketIntent gpi = (GalacticPacketIntent) i;
Player p = gpi.getPlayerManager().getPlayerFromNetworkId(gpi.getNetworkId());
if (p != null)
p.sendPacket(gpi.getPacket());
} else if (((GalacticPacketIntent)i).getPacket() instanceof Disconnect) {
GalacticPacketIntent gpi = (GalacticPacketIntent) i;
Player p = gpi.getPlayerManager().getPlayerFromNetworkId(gpi.getNetworkId());
if (p != null) {
if (p.getPlayerState() != PlayerState.DISCONNECTED) {
logOut(p);
disconnect(p, DisconnectReason.TIMEOUT);
} else {
disconnect(p, DisconnectReason.OTHER_SIDE_TERMINATED);
}
case PE_DISAPPEAR:
synchronized (zonedInPlayers) {
zonedInPlayers.remove(pei.getPlayer());
}
break;
default:
break;
}
}
private void onGalacticPacketIntent(GalacticPacketIntent gpi) {
if (gpi.getPacket() instanceof HeartBeatMessage) {
Player p = gpi.getPlayerManager().getPlayerFromNetworkId(gpi.getNetworkId());
if (p != null)
p.sendPacket(gpi.getPacket());
} else if (gpi.getPacket() instanceof Disconnect) {
Player p = gpi.getPlayerManager().getPlayerFromNetworkId(gpi.getNetworkId());
if (p != null) {
if (p.getPlayerState() != PlayerState.DISCONNECTED) {
logOut(p);
disconnect(p, DisconnectReason.TIMEOUT);
} else {
disconnect(p, DisconnectReason.OTHER_SIDE_TERMINATED);
}
}
}
}
private void onForceDisconnectIntent(ForceDisconnectIntent fdi) {
logOut(fdi.getPlayer(), !fdi.getDisappearImmediately());
disconnect(fdi.getPlayer(), fdi.getDisconnectReason());
if (fdi.getDisappearImmediately())
disappear(fdi.getPlayer());
}
private void removeOld(Player nPlayer) {
synchronized (zonedInPlayers) {
Iterator <Player> zonedIterator = zonedInPlayers.iterator();
@@ -162,14 +184,20 @@ public class ConnectionService extends Service {
}
private void logOut(Player p) {
logOut(p, true);
}
private void logOut(Player p, boolean addToDisappear) {
updatePlayTime(p);
if (p.getPlayerState() != PlayerState.LOGGED_OUT)
System.out.println("[" + p.getUsername() +"] Logged out " + p.getCharacterName());
if (p.getPlayerObject() != null)
p.getPlayerObject().setFlagBitmask(PlayerFlags.LD);
p.setPlayerState(PlayerState.LOGGED_OUT);
disappearPlayers.add(p);
updateService.schedule(disappearRunnable, (long) DISAPPEAR_THRESHOLD, TimeUnit.MILLISECONDS);
if (addToDisappear) {
disappearPlayers.add(p);
updateService.schedule(disappearRunnable, (long) DISAPPEAR_THRESHOLD, TimeUnit.MILLISECONDS);
}
}
private void disappear(Player p) {