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

14
src/main/java/net/server/channel/handlers/WhisperHandler.java
View File

@@ -50,7 +50,7 @@ public final class WhisperHandler extends AbstractMaplePacketHandler {
MapleCharacter target = c.getWorldServer().getPlayerStorage().getCharacterByName(name);
if (target == null) {
c.announce(PacketCreator.getWhisperResult(name, false));
c.sendPacket(PacketCreator.getWhisperResult(name, false));
return;
}
@@ -74,15 +74,15 @@ public final class WhisperHandler extends AbstractMaplePacketHandler {
private void handleFind(MapleCharacter user, MapleCharacter target, byte flag) {
if (user.gmLevel() >= target.gmLevel()) {
if (target.getCashShop().isOpened()) {
user.announce(PacketCreator.getFindResult(target, RT_CASH_SHOP, -1, flag));
user.sendPacket(PacketCreator.getFindResult(target, RT_CASH_SHOP, -1, flag));
} else if (target.getClient().getChannel() == user.getClient().getChannel()) {
user.announce(PacketCreator.getFindResult(target, RT_SAME_CHANNEL, target.getMapId(), flag));
user.sendPacket(PacketCreator.getFindResult(target, RT_SAME_CHANNEL, target.getMapId(), flag));
} else {
user.announce(PacketCreator.getFindResult(target, RT_DIFFERENT_CHANNEL, target.getClient().getChannel() - 1, flag));
user.sendPacket(PacketCreator.getFindResult(target, RT_DIFFERENT_CHANNEL, target.getClient().getChannel() - 1, flag));
}
} else {
// not found for whisper is the same message
user.announce(PacketCreator.getWhisperResult(target.getName(), false));
user.sendPacket(PacketCreator.getWhisperResult(target.getName(), false));
}
}
@@ -103,9 +103,9 @@ public final class WhisperHandler extends AbstractMaplePacketHandler {
LogHelper.logChat(user.getClient(), "Whisper To " + target.getName(), message);
}
target.announce(PacketCreator.getWhisperReceive(user.getName(), user.getClient().getChannel() - 1, user.isGM(), message));
target.sendPacket(PacketCreator.getWhisperReceive(user.getName(), user.getClient().getChannel() - 1, user.isGM(), message));
boolean hidden = target.isHidden() && target.gmLevel() > user.gmLevel();
user.announce(PacketCreator.getWhisperResult(target.getName(), !hidden));
user.sendPacket(PacketCreator.getWhisperResult(target.getName(), !hidden));
}
}