Reformat and clean up "net" package

This commit is contained in:
P0nk
2021-09-09 23:26:02 +02:00
parent 69f4580637
commit 6be6ea9927
235 changed files with 3556 additions and 3398 deletions

View File

@@ -31,42 +31,54 @@ public class FamilySeparateHandler extends AbstractPacketHandler {
@Override
public void handlePacket(InPacket p, Client c) {
if(!YamlConfig.config.server.USE_FAMILY_SYSTEM) return;
if (!YamlConfig.config.server.USE_FAMILY_SYSTEM) {
return;
}
Family oldFamily = c.getPlayer().getFamily();
if(oldFamily == null) return;
if (oldFamily == null) {
return;
}
FamilyEntry forkOn = null;
boolean isSenior;
if(p.available() > 0) { //packet 0x95 doesn't send id, since there is only one senior
if (p.available() > 0) { //packet 0x95 doesn't send id, since there is only one senior
forkOn = c.getPlayer().getFamily().getEntryByID(p.readInt());
if(!c.getPlayer().getFamilyEntry().isJunior(forkOn)) return; //packet editing?
if (!c.getPlayer().getFamilyEntry().isJunior(forkOn)) {
return; //packet editing?
}
isSenior = true;
} else {
forkOn = c.getPlayer().getFamilyEntry();
isSenior = false;
}
if(forkOn == null) return;
if (forkOn == null) {
return;
}
FamilyEntry senior = forkOn.getSenior();
if(senior == null) return;
if (senior == null) {
return;
}
int levelDiff = Math.abs(c.getPlayer().getLevel() - senior.getLevel());
int cost = 2500 * levelDiff;
cost += levelDiff * levelDiff;
if(c.getPlayer().getMeso() < cost) {
if (c.getPlayer().getMeso() < cost) {
c.sendPacket(PacketCreator.sendFamilyMessage(isSenior ? 81 : 80, cost));
return;
}
c.getPlayer().gainMeso(-cost);
int repCost = separateRepCost(forkOn);
senior.gainReputation(-repCost, false);
if(senior.getSenior() != null) senior.getSenior().gainReputation(-(repCost/2), false);
if (senior.getSenior() != null) {
senior.getSenior().gainReputation(-(repCost / 2), false);
}
forkOn.announceToSenior(PacketCreator.serverNotice(5, forkOn.getName() + " has left the family."), true);
forkOn.fork();
c.sendPacket(PacketCreator.getFamilyInfo(forkOn)); //pedigree info will be requested from the client if the window is open
forkOn.updateSeniorFamilyInfo(true);
c.sendPacket(PacketCreator.sendFamilyMessage(1, 0));
}
private static int separateRepCost(FamilyEntry junior) {
int level = junior.getLevel();
int ret = level / 20;