projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-10-18 08:02:53 -04:00
Code Issues Projects Releases Wiki Activity

Refactored disconnect handling, updated engine

Browse Source
This commit is contained in:
Light2
2013-12-15 23:49:12 +01:00
parent 8de830bb86
commit dce213cab1
19 changed files with 154 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/NGECore.java
+11 -10
View File
@@ -35,6 +35,7 @@ import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import org.apache.mina.core.service.IoHandler;
import org.apache.mina.core.session.IoSession;
import protocol.swg.ChatSystemMessage;
import net.engio.mbassy.bus.config.BusConfiguration;
@@ -112,7 +113,7 @@ public class NGECore {
private volatile boolean isShuttingDown = false;
private ConcurrentHashMap<Integer, Client> clients = new ConcurrentHashMap<Integer, Client>();
private ConcurrentHashMap<IoSession, Client> clients = new ConcurrentHashMap<IoSession, Client>();
// Database
@@ -451,7 +452,7 @@ public class NGECore {
public int getActiveClients() {
int connections = 0;
for (Map.Entry<Integer, Client> c : clients.entrySet()) {
for (Map.Entry<IoSession, Client> c : clients.entrySet()) {
if(c.getValue().getSession() != null) {
if (c.getValue().getSession().isConnected()) {
connections++;
@@ -463,7 +464,7 @@ public class NGECore {
public int getActiveZoneClients() {
int connections = 0;
for (Map.Entry<Integer, Client> c : clients.entrySet()) {
for (Map.Entry<IoSession, Client> c : clients.entrySet()) {
if(c.getValue().getSession() != null) {
if (c.getValue().getSession().isConnected() && c.getValue().getParent() != null) {
connections++;
@@ -474,23 +475,23 @@ public class NGECore {
}
public Client getClient(int connectionID) {
return clients.get(connectionID);
public Client getClient(IoSession session) {
return clients.get(session);
}
public ConcurrentHashMap<Integer, Client> getActiveConnectionsMap() {
public ConcurrentHashMap<IoSession, Client> getActiveConnectionsMap() {
return clients;
}
/*
* --------------- Other methods for services ---------------
*/
public void addClient(Integer connectionID, Client client) {
clients.put(connectionID, client);
public void addClient(IoSession session, Client client) {
clients.put(session, client);
}
public void removeClient(Integer connectionID) {
clients.remove(connectionID);
public void removeClient(IoSession session) {
clients.remove(session);
}
// for python scripts