Merge pull request #164 from P0nk/fix/custom-charset-string #patch

Fix writeString not fully respecting charset

src/main/java/net/packet/ByteBufOutPacket.java

@@ -71,8 +71,9 @@ public class ByteBufOutPacket implements OutPacket {
 
     @Override
     public void writeString(String value) {
-        writeShort((short) value.length());
+        byte[] bytes = value.getBytes(CharsetConstants.CHARSET);
-        writeBytes(value.getBytes(CharsetConstants.CHARSET));
+        writeShort(bytes.length);
+        writeBytes(bytes);
     }
 
     @Override

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

@@ -58,40 +58,33 @@ public final class ChangeMapHandler extends AbstractPacketHandler {
         if (chr.getTrade() != null) {
             Trade.cancelTrade(chr, Trade.TradeResult.UNSUCCESSFUL_ANOTHER_MAP);
         }
-        if (p.available() == 0) { //Cash Shop :)
+
-            if (!chr.getCashShop().isOpened()) {
+        boolean enteringMapFromCashShop = p.available() == 0;
-                c.disconnect(false, false);
+        if (enteringMapFromCashShop) {
+            enterFromCashShop(c);
             return;
         }
-            String[] socket = c.getChannelServer().getIP().split(":");
-            chr.getCashShop().open(false);
 
-            chr.setSessionTransitionState();
-            try {
-                c.sendPacket(PacketCreator.getChannelChange(InetAddress.getByName(socket[0]), Integer.parseInt(socket[1])));
-            } catch (UnknownHostException ex) {
-                ex.printStackTrace();
-            }
-        } else {
         if (chr.getCashShop().isOpened()) {
             c.disconnect(false, false);
             return;
         }
+
         try {
             p.readByte(); // 1 = from dying 0 = regular portals
-                int targetid = p.readInt();
+            int targetMapId = p.readInt();
-                String startwp = p.readString();
+            String portalName = p.readString();
-                Portal portal = chr.getMap().getPortal(startwp);
+            Portal portal = chr.getMap().getPortal(portalName);
             p.readByte();
             boolean wheel = p.readByte() > 0;
 
-                boolean chasing = p.readByte() == 1 && chr.isGM();
+            boolean chasing = p.readByte() == 1 && chr.isGM() && p.available() == 2 * Integer.BYTES;
             if (chasing) {
                 chr.setChasing(true);
                 chr.setPosition(new Point(p.readInt(), p.readInt()));
             }
 
-                if (targetid != -1) {
+            if (targetMapId != -1) {
                 if (!chr.isAlive()) {
                     MapleMap map = chr.getMap();
                     if (wheel && chr.haveItemWithId(ItemId.WHEEL_OF_FORTUNE, false)) {
@@ -113,40 +106,40 @@ public final class ChangeMapHandler extends AbstractPacketHandler {
                     }
                 } else {
                     if (chr.isGM()) {
-                            MapleMap to = chr.getWarpMap(targetid);
+                        MapleMap to = chr.getWarpMap(targetMapId);
                         chr.changeMap(to, to.getPortal(0));
                     } else {
                         final int divi = chr.getMapId() / 100;
                         boolean warp = false;
                         if (divi == 0) {
-                                if (targetid == 10000) {
+                            if (targetMapId == 10000) {
                                 warp = true;
                             }
                         } else if (divi == 20100) {
-                                if (targetid == MapId.LITH_HARBOUR) {
+                            if (targetMapId == MapId.LITH_HARBOUR) {
                                 c.sendPacket(PacketCreator.lockUI(false));
                                 c.sendPacket(PacketCreator.disableUI(false));
                                 warp = true;
                             }
                         } else if (divi == 9130401) { // Only allow warp if player is already in Intro map, or else = hack
-                                if (targetid == MapId.EREVE || targetid / 100 == 9130401) { // Cygnus introduction
+                            if (targetMapId == MapId.EREVE || targetMapId / 100 == 9130401) { // Cygnus introduction
                                 warp = true;
                             }
                         } else if (divi == 9140900) { // Aran Introduction
-                                if (targetid == MapId.ARAN_TUTO_2 || targetid == MapId.ARAN_TUTO_3 || targetid == MapId.ARAN_TUTO_4 || targetid == MapId.ARAN_INTRO) {
+                            if (targetMapId == MapId.ARAN_TUTO_2 || targetMapId == MapId.ARAN_TUTO_3 || targetMapId == MapId.ARAN_TUTO_4 || targetMapId == MapId.ARAN_INTRO) {
                                 warp = true;
                             }
                         } else if (divi / 10 == 1020) { // Adventurer movie clip Intro
-                                if (targetid == 1020000) {
+                            if (targetMapId == 1020000) {
                                 warp = true;
                             }
                         } else if (divi / 10 >= 980040 && divi / 10 <= 980045) {
-                                if (targetid == MapId.WITCH_TOWER_ENTRANCE) {
+                            if (targetMapId == MapId.WITCH_TOWER_ENTRANCE) {
                                 warp = true;
                             }
                         }
                         if (warp) {
-                                final MapleMap to = chr.getWarpMap(targetid);
+                            final MapleMap to = chr.getWarpMap(targetMapId);
                             chr.changeMap(to, to.getPortal(0));
                         }
                     }
@@ -178,6 +171,24 @@ public final class ChangeMapHandler extends AbstractPacketHandler {
         } catch (Exception e) {
             e.printStackTrace();
         }
+
+    }
+
+    private void enterFromCashShop(Client c) {
+        final Character chr = c.getPlayer();
+
+        if (!chr.getCashShop().isOpened()) {
+            c.disconnect(false, false);
+            return;
+        }
+        String[] socket = c.getChannelServer().getIP().split(":");
+        chr.getCashShop().open(false);
+
+        chr.setSessionTransitionState();
+        try {
+            c.sendPacket(PacketCreator.getChannelChange(InetAddress.getByName(socket[0]), Integer.parseInt(socket[1])));
+        } catch (UnknownHostException ex) {
+            ex.printStackTrace();
         }
     }
 }