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

All packet creating methods now create Packet instead of byte[]

Browse Source 
This commit got way too big...
- Remove deprecated methods for sending packets
- Favor OutPacket & Packet over MaplePacketLittleEndianWriter, LittleEndianWriter, and byte array
- Split up some packet creating methods into separate classes
This commit is contained in:
P0nk
2021-08-21 01:36:51 +02:00
parent b5cd6887ae
commit 8f6860d7d7
231 changed files with 6403 additions and 6927 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,7 +49,7 @@ public final class ChangeMapHandler extends AbstractMaplePacketHandler {
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(PacketCreator.enableActions());
c.sendPacket(PacketCreator.enableActions());
return;
}
if (chr.getTrade() != null) {
@@ -65,7 +65,7 @@ public final class ChangeMapHandler extends AbstractMaplePacketHandler {
chr.setSessionTransitionState();
try {
c.announce(PacketCreator.getChannelChange(InetAddress.getByName(socket[0]), Integer.parseInt(socket[1])));
c.sendPacket(PacketCreator.getChannelChange(InetAddress.getByName(socket[0]), Integer.parseInt(socket[1])));
} catch (UnknownHostException ex) {
ex.printStackTrace();
}
@@ -95,7 +95,7 @@ public final class ChangeMapHandler extends AbstractMaplePacketHandler {
// thanks lucasziron (lziron) for showing revivePlayer() triggering by Wheel
MapleInventoryManipulator.removeById(c, MapleInventoryType.CASH, 5510000, 1, true, false);
chr.announce(PacketCreator.showWheelsLeft(chr.getItemQuantity(5510000, false)));
chr.sendPacket(PacketCreator.showWheelsLeft(chr.getItemQuantity(5510000, false)));
chr.updateHp(50);
chr.changeMap(map, map.findClosestPlayerSpawnpoint(chr.getPosition()));
@@ -121,8 +121,8 @@ public final class ChangeMapHandler extends AbstractMaplePacketHandler {
}
} else if (divi == 20100) {
if (targetid == 104000000) {
c.announce(PacketCreator.lockUI(false));
c.announce(PacketCreator.disableUI(false));
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
@@ -151,8 +151,8 @@ public final class ChangeMapHandler extends AbstractMaplePacketHandler {
}
if (portal != null && !portal.getPortalStatus()) {
c.announce(PacketCreator.blockedMessage(1));
c.announce(PacketCreator.enableActions());
c.sendPacket(PacketCreator.blockedMessage(1));
c.sendPacket(PacketCreator.enableActions());
return;
}
@@ -164,13 +164,13 @@ public final class ChangeMapHandler extends AbstractMaplePacketHandler {
if (portal != null) {
if (portal.getPosition().distanceSq(chr.getPosition()) > 400000) {
c.announce(PacketCreator.enableActions());
c.sendPacket(PacketCreator.enableActions());
return;
}
portal.enterPortal(c);
} else {
c.announce(PacketCreator.enableActions());
c.sendPacket(PacketCreator.enableActions());
}
} catch (Exception e) {
e.printStackTrace();