From f6452b2320ede8a94b81cd4c646ca42e9664edb2 Mon Sep 17 00:00:00 2001 From: RubenD96 Date: Thu, 22 Apr 2021 21:55:49 +0200 Subject: [PATCH] Reformat ChangeMapHandler before editing --- .../channel/handlers/ChangeMapHandler.java | 268 +++++++++--------- 1 file changed, 134 insertions(+), 134 deletions(-) diff --git a/src/main/java/net/server/channel/handlers/ChangeMapHandler.java b/src/main/java/net/server/channel/handlers/ChangeMapHandler.java index d3be7548ab..2e89f9906f 100644 --- a/src/main/java/net/server/channel/handlers/ChangeMapHandler.java +++ b/src/main/java/net/server/channel/handlers/ChangeMapHandler.java @@ -21,153 +21,153 @@ along with this program. If not, see . */ package net.server.channel.handlers; -import java.net.InetAddress; -import java.net.UnknownHostException; -import java.util.Calendar; - -import net.AbstractMaplePacketHandler; import client.MapleCharacter; import client.MapleClient; import client.inventory.MapleInventoryType; import client.inventory.manipulator.MapleInventoryManipulator; -import server.maps.MaplePortal; +import net.AbstractMaplePacketHandler; import server.MapleTrade; import server.maps.MapleMap; +import server.maps.MaplePortal; import tools.FilePrinter; import tools.MaplePacketCreator; import tools.data.input.SeekableLittleEndianAccessor; +import java.net.InetAddress; +import java.net.UnknownHostException; +import java.util.Calendar; + public final class ChangeMapHandler extends AbstractMaplePacketHandler { - @Override - public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) { - MapleCharacter chr = c.getPlayer(); + @Override + public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) { + MapleCharacter chr = c.getPlayer(); - if (chr.isChangingMaps() || chr.isBanned()) { - if(chr.isChangingMaps()) { - FilePrinter.printError(FilePrinter.PORTAL_STUCK + chr.getName() + ".txt", "Player " + chr.getName() + " got stuck when changing maps. Timestamp: " + Calendar.getInstance().getTime().toString() + " Last visited mapids: " + chr.getLastVisitedMapids()); + if (chr.isChangingMaps() || chr.isBanned()) { + if (chr.isChangingMaps()) { + FilePrinter.printError(FilePrinter.PORTAL_STUCK + chr.getName() + ".txt", "Player " + chr.getName() + " got stuck when changing maps. Timestamp: " + Calendar.getInstance().getTime().toString() + " Last visited mapids: " + chr.getLastVisitedMapids()); + } + + c.announce(MaplePacketCreator.enableActions()); + return; + } + if (chr.getTrade() != null) { + MapleTrade.cancelTrade(chr, MapleTrade.TradeResult.UNSUCCESSFUL_ANOTHER_MAP); + } + if (slea.available() == 0) { //Cash Shop :) + if (!chr.getCashShop().isOpened()) { + c.disconnect(false, false); + return; + } + String[] socket = c.getChannelServer().getIP().split(":"); + chr.getCashShop().open(false); + + chr.setSessionTransitionState(); + try { + c.announce(MaplePacketCreator.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 { + slea.readByte(); // 1 = from dying 0 = regular portals + int targetid = slea.readInt(); + String startwp = slea.readMapleAsciiString(); + MaplePortal portal = chr.getMap().getPortal(startwp); + slea.readByte(); + boolean wheel = slea.readShort() > 0; + + if (targetid != -1) { + if (!chr.isAlive()) { + MapleMap map = chr.getMap(); + if (wheel && chr.haveItemWithId(5510000, false)) { + // thanks lucasziron (lziron) for showing revivePlayer() triggering by Wheel + + MapleInventoryManipulator.removeById(c, MapleInventoryType.CASH, 5510000, 1, true, false); + chr.announce(MaplePacketCreator.showWheelsLeft(chr.getItemQuantity(5510000, false))); + + chr.updateHp(50); + chr.changeMap(map, map.findClosestPlayerSpawnpoint(chr.getPosition())); + } else { + boolean executeStandardPath = true; + if (chr.getEventInstance() != null) { + executeStandardPath = chr.getEventInstance().revivePlayer(chr); + } + if (executeStandardPath) { + chr.respawn(map.getReturnMapId()); + } } - - c.announce(MaplePacketCreator.enableActions()); - return; - } - if (chr.getTrade() != null) { - MapleTrade.cancelTrade(chr, MapleTrade.TradeResult.UNSUCCESSFUL_ANOTHER_MAP); - } - if (slea.available() == 0) { //Cash Shop :) - if(!chr.getCashShop().isOpened()) { - c.disconnect(false, false); - return; - } - String[] socket = c.getChannelServer().getIP().split(":"); - chr.getCashShop().open(false); - - chr.setSessionTransitionState(); - try { - c.announce(MaplePacketCreator.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 { - slea.readByte(); // 1 = from dying 0 = regular portals - int targetid = slea.readInt(); - String startwp = slea.readMapleAsciiString(); - MaplePortal portal = chr.getMap().getPortal(startwp); - slea.readByte(); - boolean wheel = slea.readShort() > 0; - - if (targetid != -1) { - if (!chr.isAlive()) { - MapleMap map = chr.getMap(); - if (wheel && chr.haveItemWithId(5510000, false)) { - // thanks lucasziron (lziron) for showing revivePlayer() triggering by Wheel - - MapleInventoryManipulator.removeById(c, MapleInventoryType.CASH, 5510000, 1, true, false); - chr.announce(MaplePacketCreator.showWheelsLeft(chr.getItemQuantity(5510000, false))); - - chr.updateHp(50); - chr.changeMap(map, map.findClosestPlayerSpawnpoint(chr.getPosition())); - } else { - boolean executeStandardPath = true; - if (chr.getEventInstance() != null) { - executeStandardPath = chr.getEventInstance().revivePlayer(chr); - } - if (executeStandardPath) { - chr.respawn(map.getReturnMapId()); - } - } - } else { - if (chr.isGM()) { - MapleMap to = chr.getWarpMap(targetid); - chr.changeMap(to, to.getPortal(0)); - } else { - final int divi = chr.getMapId() / 100; - boolean warp = false; - if (divi == 0) { - if (targetid == 10000) { - warp = true; - } - } else if (divi == 20100) { - if (targetid == 104000000) { - c.announce(MaplePacketCreator.lockUI(false)); - c.announce(MaplePacketCreator.disableUI(false)); - warp = true; - } - } else if (divi == 9130401) { // Only allow warp if player is already in Intro map, or else = hack - if (targetid == 130000000 || targetid / 100 == 9130401) { // Cygnus introduction - warp = true; - } - } else if (divi == 9140900) { // Aran Introduction - if (targetid == 914090011 || targetid == 914090012 || targetid == 914090013 || targetid == 140090000) { - warp = true; - } - } else if (divi / 10 == 1020) { // Adventurer movie clip Intro - if (targetid == 1020000) { - warp = true; - } - } else if(divi / 10 >= 980040 && divi / 10 <= 980045) { - if(targetid == 980040000) { - warp = true; - } - } - if (warp) { - final MapleMap to = chr.getWarpMap(targetid); - chr.changeMap(to, to.getPortal(0)); - } - } - } + } else { + if (chr.isGM()) { + MapleMap to = chr.getWarpMap(targetid); + chr.changeMap(to, to.getPortal(0)); + } else { + final int divi = chr.getMapId() / 100; + boolean warp = false; + if (divi == 0) { + if (targetid == 10000) { + warp = true; } - - if (portal != null && !portal.getPortalStatus()) { - c.announce(MaplePacketCreator.blockedMessage(1)); - c.announce(MaplePacketCreator.enableActions()); - return; - } - - if (chr.getMapId() == 109040004) { - chr.getFitness().resetTimes(); - } else if (chr.getMapId() == 109030003 || chr.getMapId() == 109030103) { - chr.getOla().resetTimes(); - } - - if (portal != null) { - if(portal.getPosition().distanceSq(chr.getPosition()) > 400000) { - c.announce(MaplePacketCreator.enableActions()); - return; - } - - portal.enterPortal(c); - } else { - c.announce(MaplePacketCreator.enableActions()); - } - } catch (Exception e) { - e.printStackTrace(); - } - } - } + } else if (divi == 20100) { + if (targetid == 104000000) { + c.announce(MaplePacketCreator.lockUI(false)); + c.announce(MaplePacketCreator.disableUI(false)); + warp = true; + } + } else if (divi == 9130401) { // Only allow warp if player is already in Intro map, or else = hack + if (targetid == 130000000 || targetid / 100 == 9130401) { // Cygnus introduction + warp = true; + } + } else if (divi == 9140900) { // Aran Introduction + if (targetid == 914090011 || targetid == 914090012 || targetid == 914090013 || targetid == 140090000) { + warp = true; + } + } else if (divi / 10 == 1020) { // Adventurer movie clip Intro + if (targetid == 1020000) { + warp = true; + } + } else if (divi / 10 >= 980040 && divi / 10 <= 980045) { + if (targetid == 980040000) { + warp = true; + } + } + if (warp) { + final MapleMap to = chr.getWarpMap(targetid); + chr.changeMap(to, to.getPortal(0)); + } + } + } + } + + if (portal != null && !portal.getPortalStatus()) { + c.announce(MaplePacketCreator.blockedMessage(1)); + c.announce(MaplePacketCreator.enableActions()); + return; + } + + if (chr.getMapId() == 109040004) { + chr.getFitness().resetTimes(); + } else if (chr.getMapId() == 109030003 || chr.getMapId() == 109030103) { + chr.getOla().resetTimes(); + } + + if (portal != null) { + if (portal.getPosition().distanceSq(chr.getPosition()) > 400000) { + c.announce(MaplePacketCreator.enableActions()); + return; + } + + portal.enterPortal(c); + } else { + c.announce(MaplePacketCreator.enableActions()); + } + } catch (Exception e) { + e.printStackTrace(); + } + } + } } \ No newline at end of file