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

Rename and clean up MapleFamily

Browse Source
This commit is contained in:
P0nk
2021-09-09 21:16:56 +02:00
parent 56c9e0f664
commit 3370152d58
12 changed files with 80 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/net/server/channel/handlers/AcceptFamilyHandler.java
View File

@@ -23,7 +23,7 @@ package net.server.channel.handlers;
import client.Character;
import client.Client;
import client.MapleFamily;
import client.Family;
import client.MapleFamilyEntry;
import config.YamlConfig;
import net.AbstractPacketHandler;
@@ -76,7 +76,7 @@ public final class AcceptFamilyHandler extends AbstractPacketHandler {
}
} else { //absorb target family
MapleFamilyEntry targetEntry = chr.getFamilyEntry();
MapleFamily targetFamily = targetEntry.getFamily();
Family targetFamily = targetEntry.getFamily();
if(targetFamily.getLeader() != targetEntry) return;
if(inviter.getFamily().getTotalGenerations() + targetFamily.getTotalGenerations() <= YamlConfig.config.server.FAMILY_MAX_GENERATIONS) {
targetEntry.join(inviter.getFamilyEntry());
@@ -92,7 +92,7 @@ public final class AcceptFamilyHandler extends AbstractPacketHandler {
chr.sendPacket(PacketCreator.sendFamilyMessage(76, 0));
return;
}
MapleFamily newFamily = new MapleFamily(-1, c.getWorld());
Family newFamily = new Family(-1, c.getWorld());
c.getWorldServer().addFamily(newFamily.getID(), newFamily);
MapleFamilyEntry inviterEntry = new MapleFamilyEntry(newFamily, inviter.getId(), inviter.getName(), inviter.getLevel(), inviter.getJob());
inviterEntry.setCharacter(inviter);

4
src/main/java/net/server/channel/handlers/FamilyPreceptsHandler.java
View File

@@ -1,7 +1,7 @@
package net.server.channel.handlers;
import client.Client;
import client.MapleFamily;
import client.Family;
import net.AbstractPacketHandler;
import net.packet.InPacket;
import tools.PacketCreator;
@@ -10,7 +10,7 @@ public class FamilyPreceptsHandler extends AbstractPacketHandler {
@Override
public void handlePacket(InPacket p, Client c) {
MapleFamily family = c.getPlayer().getFamily();
Family family = c.getPlayer().getFamily();
if(family == null) return;
if(family.getLeader().getChr() != c.getPlayer()) return; //only the leader can set the precepts
String newPrecepts = p.readString();

4
src/main/java/net/server/channel/handlers/FamilySeparateHandler.java
View File

@@ -20,7 +20,7 @@
package net.server.channel.handlers;
import client.Client;
import client.MapleFamily;
import client.Family;
import client.MapleFamilyEntry;
import config.YamlConfig;
import net.AbstractPacketHandler;
@@ -32,7 +32,7 @@ public class FamilySeparateHandler extends AbstractPacketHandler {
@Override
public void handlePacket(InPacket p, Client c) {
if(!YamlConfig.config.server.USE_FAMILY_SYSTEM) return;
MapleFamily oldFamily = c.getPlayer().getFamily();
Family oldFamily = c.getPlayer().getFamily();
if(oldFamily == null) return;
MapleFamilyEntry forkOn = null;
boolean isSenior;

2
src/main/java/net/server/channel/handlers/PlayerLoggedinHandler.java
View File

@@ -247,7 +247,7 @@ public final class PlayerLoggedinHandler extends AbstractPacketHandler {
c.sendPacket(PacketCreator.loadFamily(player));
if (player.getFamilyId() > 0) {
MapleFamily f = wserv.getFamily(player.getFamilyId());
Family f = wserv.getFamily(player.getFamilyId());
if (f != null) {
MapleFamilyEntry familyEntry = f.getEntryByID(player.getId());
if (familyEntry != null) {