Sweetgum/sweetgum-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove players on exceptionCaught with IOEXception. MINA closes sessions automatically and does not call sessionClosed when an IOException is caught. (#389)

Browse Source
This commit is contained in:
MedicOP
2019-02-04 03:40:57 +01:00
committed by Ronan Lana
parent fdcc03c5f7
commit 55c78c1094
1 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/net/MapleServerHandler.java
View File

@@ -87,7 +87,7 @@ public class MapleServerHandler extends IoHandlerAdapter {
}
@Override
public void exceptionCaught(IoSession session, Throwable cause) throws Exception {
public void exceptionCaught(IoSession session, Throwable cause) {
if (cause instanceof org.apache.mina.core.write.WriteToClosedSessionException) {
return;
}
@@ -97,12 +97,26 @@ public class MapleServerHandler extends IoHandlerAdapter {
cause.printStackTrace();
*/
if (cause instanceof IOException || cause instanceof ClassCastException) {
return;
}
MapleClient mc = (MapleClient) session.getAttribute(MapleClient.CLIENT_KEY);
if (mc != null && mc.getPlayer() != null) {
FilePrinter.printError(FilePrinter.EXCEPTION_CAUGHT, cause, "Exception caught by: " + mc.getPlayer());
MapleClient client = (MapleClient) session.getAttribute(MapleClient.CLIENT_KEY);
if (client != null) {
if (cause instanceof IOException) { // mina closes session automatically and does not call sessionClosed on IOException
if (isLoginServerHandler()) {
MapleSessionCoordinator.getInstance().closeLoginSession(session);
} else {
MapleSessionCoordinator.getInstance().closeSession(session, null);
}
try {
client.disconnect(false, client.getPlayer() != null && client.getPlayer().getCashShop().isOpened());
} catch (Throwable t) {
FilePrinter.printError(FilePrinter.ACCOUNT_STUCK, t);
} finally {
session.removeAttribute(MapleClient.CLIENT_KEY);
}
} else if (client.getPlayer() != null) {
FilePrinter.printError(FilePrinter.EXCEPTION_CAUGHT, cause, "Exception caught by: " + client.getPlayer());
}
}
}