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

Reformat ChangeMapHandler before editing

Browse Source
This commit is contained in:
RubenD96
2021-04-22 21:55:49 +02:00
parent 215abb3198
commit f6452b2320
1 changed files with 134 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/net/server/channel/handlers/ChangeMapHandler.java
View File

@@ -21,22 +21,22 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package net.server.channel.handlers; 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.MapleCharacter;
import client.MapleClient; import client.MapleClient;
import client.inventory.MapleInventoryType; import client.inventory.MapleInventoryType;
import client.inventory.manipulator.MapleInventoryManipulator; import client.inventory.manipulator.MapleInventoryManipulator;
import server.maps.MaplePortal; import net.AbstractMaplePacketHandler;
import server.MapleTrade; import server.MapleTrade;
import server.maps.MapleMap; import server.maps.MapleMap;
import server.maps.MaplePortal;
import tools.FilePrinter; import tools.FilePrinter;
import tools.MaplePacketCreator; import tools.MaplePacketCreator;
import tools.data.input.SeekableLittleEndianAccessor; import tools.data.input.SeekableLittleEndianAccessor;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.Calendar;
public final class ChangeMapHandler extends AbstractMaplePacketHandler { public final class ChangeMapHandler extends AbstractMaplePacketHandler {
@Override @Override
@@ -44,7 +44,7 @@ public final class ChangeMapHandler extends AbstractMaplePacketHandler {
MapleCharacter chr = c.getPlayer(); MapleCharacter chr = c.getPlayer();
if (chr.isChangingMaps() || chr.isBanned()) { if (chr.isChangingMaps() || chr.isBanned()) {
if(chr.isChangingMaps()) { 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()); 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());
} }
@@ -55,7 +55,7 @@ public final class ChangeMapHandler extends AbstractMaplePacketHandler {
MapleTrade.cancelTrade(chr, MapleTrade.TradeResult.UNSUCCESSFUL_ANOTHER_MAP); MapleTrade.cancelTrade(chr, MapleTrade.TradeResult.UNSUCCESSFUL_ANOTHER_MAP);
} }
if (slea.available() == 0) { //Cash Shop :) if (slea.available() == 0) { //Cash Shop :)
if(!chr.getCashShop().isOpened()) { if (!chr.getCashShop().isOpened()) {
c.disconnect(false, false); c.disconnect(false, false);
return; return;
} }
@@ -69,7 +69,7 @@ public final class ChangeMapHandler extends AbstractMaplePacketHandler {
ex.printStackTrace(); ex.printStackTrace();
} }
} else { } else {
if(chr.getCashShop().isOpened()) { if (chr.getCashShop().isOpened()) {
c.disconnect(false, false); c.disconnect(false, false);
return; return;
} }
@@ -130,8 +130,8 @@ public final class ChangeMapHandler extends AbstractMaplePacketHandler {
if (targetid == 1020000) { if (targetid == 1020000) {
warp = true; warp = true;
} }
} else if(divi / 10 >= 980040 && divi / 10 <= 980045) { } else if (divi / 10 >= 980040 && divi / 10 <= 980045) {
if(targetid == 980040000) { if (targetid == 980040000) {
warp = true; warp = true;
} }
} }
@@ -156,7 +156,7 @@ public final class ChangeMapHandler extends AbstractMaplePacketHandler {
} }
if (portal != null) { if (portal != null) {
if(portal.getPosition().distanceSq(chr.getPosition()) > 400000) { if (portal.getPosition().distanceSq(chr.getPosition()) > 400000) {
c.announce(MaplePacketCreator.enableActions()); c.announce(MaplePacketCreator.enableActions());
return; return;
} }