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/AcceptFamilyHandler.java
View File

@@ -67,7 +67,7 @@ public final class AcceptFamilyHandler extends AbstractMaplePacketHandler {
MapleFamilyEntry newEntry = new MapleFamilyEntry(inviter.getFamily(), chr.getId(), chr.getName(), chr.getLevel(), chr.getJob());
newEntry.setCharacter(chr);
if(!newEntry.setSenior(inviter.getFamilyEntry(), true)) {
inviter.announce(PacketCreator.sendFamilyMessage(1, 0));
inviter.sendPacket(PacketCreator.sendFamilyMessage(1, 0));
return;
} else {
// save
@@ -81,15 +81,15 @@ public final class AcceptFamilyHandler extends AbstractMaplePacketHandler {
if(inviter.getFamily().getTotalGenerations() + targetFamily.getTotalGenerations() <= YamlConfig.config.server.FAMILY_MAX_GENERATIONS) {
targetEntry.join(inviter.getFamilyEntry());
} else {
inviter.announce(PacketCreator.sendFamilyMessage(76, 0));
chr.announce(PacketCreator.sendFamilyMessage(76, 0));
inviter.sendPacket(PacketCreator.sendFamilyMessage(76, 0));
chr.sendPacket(PacketCreator.sendFamilyMessage(76, 0));
return;
}
}
} else { // create new family
if(chr.getFamily() != null && inviter.getFamily() != null && chr.getFamily().getTotalGenerations() + inviter.getFamily().getTotalGenerations() >= YamlConfig.config.server.FAMILY_MAX_GENERATIONS) {
inviter.announce(PacketCreator.sendFamilyMessage(76, 0));
chr.announce(PacketCreator.sendFamilyMessage(76, 0));
inviter.sendPacket(PacketCreator.sendFamilyMessage(76, 0));
chr.sendPacket(PacketCreator.sendFamilyMessage(76, 0));
return;
}
MapleFamily newFamily = new MapleFamily(-1, c.getWorld());
@@ -113,14 +113,14 @@ public final class AcceptFamilyHandler extends AbstractMaplePacketHandler {
}
}
c.getPlayer().getFamily().broadcast(PacketCreator.sendFamilyJoinResponse(true, c.getPlayer().getName()), c.getPlayer().getId());
c.announce(PacketCreator.getSeniorMessage(inviter.getName()));
c.announce(PacketCreator.getFamilyInfo(chr.getFamilyEntry()));
c.sendPacket(PacketCreator.getSeniorMessage(inviter.getName()));
c.sendPacket(PacketCreator.getFamilyInfo(chr.getFamilyEntry()));
chr.getFamilyEntry().updateSeniorFamilyInfo(true);
} else {
inviter.announce(PacketCreator.sendFamilyJoinResponse(false, c.getPlayer().getName()));
inviter.sendPacket(PacketCreator.sendFamilyJoinResponse(false, c.getPlayer().getName()));
}
}
c.announce(PacketCreator.sendFamilyMessage(0, 0));
c.sendPacket(PacketCreator.sendFamilyMessage(0, 0));
}
private static void insertNewFamilyRecord(int characterID, int familyID, int seniorID, boolean updateChar) {