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

10
src/main/java/net/server/channel/handlers/HiredMerchantRequest.java
View File

@@ -53,11 +53,11 @@ public final class HiredMerchantRequest extends AbstractMaplePacketHandler {
MaplePlayerShop shop = mc.getPlayerShop();
if (shop != null && shop.isOwner(mc)) {
chr.announce(PacketCreator.getMiniRoomError(13));
chr.sendPacket(PacketCreator.getMiniRoomError(13));
return;
}
} else {
chr.announce(PacketCreator.getMiniRoomError(13));
chr.sendPacket(PacketCreator.getMiniRoomError(13));
return;
}
}
@@ -65,7 +65,7 @@ public final class HiredMerchantRequest extends AbstractMaplePacketHandler {
Point cpos = chr.getPosition();
MaplePortal portal = chr.getMap().findClosestTeleportPortal(cpos);
if (portal != null && portal.getPosition().distance(cpos) < 120.0) {
chr.announce(PacketCreator.getMiniRoomError(10));
chr.sendPacket(PacketCreator.getMiniRoomError(10));
return;
}
} catch (Exception e) {
@@ -76,9 +76,9 @@ public final class HiredMerchantRequest extends AbstractMaplePacketHandler {
if (!chr.hasMerchant()) {
try {
if (ItemFactory.MERCHANT.loadItems(chr.getId(), false).isEmpty() && chr.getMerchantMeso() == 0) {
c.announce(PacketCreator.hiredMerchantBox());
c.sendPacket(PacketCreator.hiredMerchantBox());
} else {
chr.announce(PacketCreator.retrieveFirstMessage());
chr.sendPacket(PacketCreator.retrieveFirstMessage());
}
} catch (SQLException ex) {
ex.printStackTrace();