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

Cash shop transition patch

Browse Source 
Solved an issue where players were being unable to return to the game once exiting the cash shop.
This commit is contained in:
ronancpl
2019-03-27 13:27:38 -03:00
parent 83266508af
commit 16deacb426
5 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/client/MapleCharacter.java
View File

@@ -487,6 +487,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
}
public void setAwayFromChannelWorld() {
client.getSession().setAttribute(MapleClient.CLIENT_CASH_SHOP);
setAwayFromChannelWorld(false);
}

1
src/client/MapleClient.java
View File

@@ -91,6 +91,7 @@ public class MapleClient {
public static final String CLIENT_HWID = "HWID";
public static final String CLIENT_NIBBLEHWID = "HWID2";
public static final String CLIENT_REMOTE_ADDRESS = "REMOTE_IP";
public static final String CLIENT_CASH_SHOP = "CASH_SHOP";
private MapleAESOFB send;
private MapleAESOFB receive;
private final IoSession session;

6
src/net/MapleServerHandler.java
View File

@@ -150,11 +150,9 @@ public class MapleServerHandler extends IoHandlerAdapter {
MapleClient client = (MapleClient) session.getAttribute(MapleClient.CLIENT_KEY);
if (client != null) {
try {
boolean inCashShop = false;
if (client.getPlayer() != null) {
inCashShop = client.getPlayer().getCashShop().isOpened();
if (!session.containsAttribute(MapleClient.CLIENT_CASH_SHOP)) {
client.disconnect(false, false);
}
client.disconnect(false, inCashShop);
} catch (Throwable t) {
FilePrinter.printError(FilePrinter.ACCOUNT_STUCK, t);
} finally {

1
src/net/server/channel/handlers/EnterCashShopHandler.java
View File

@@ -42,7 +42,6 @@ public class EnterCashShopHandler extends AbstractMaplePacketHandler {
if (mc.cannotEnterCashShop()) {
c.announce(MaplePacketCreator.enableActions());
return;
}
if(mc.getEventInstance() != null) {