Merge branch 'master' into feat/postgresql-database

# Conflicts:
#	docker-compose.yml

src/main/java/net/server/channel/handlers/ChangeMapHandler.java

@@ -30,6 +30,7 @@ import constants.id.MapId;
 import net.AbstractPacketHandler;
 import net.netty.GameViolationException;
 import net.packet.InPacket;
+import net.server.Server;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import server.Trade;
@@ -180,7 +181,11 @@ public final class ChangeMapHandler extends AbstractPacketHandler {
         if (!chr.getCashShop().isOpened()) {
             throw new GameViolationException("Enter map from cash shop, but is not in cash shop");
         }
-        String[] socket = c.getChannelServer().getIP().split(":");
+        String[] socket = Server.getInstance().getInetSocket(c, c.getWorld(), c.getChannel());
+        if (socket == null) {
+            c.enableCSActions();
+            return;
+        }
         chr.getCashShop().open(false);
 
         chr.setSessionTransitionState();