Sweetgum/sweetgum-server
1
0
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

8
src/main/java/client/Character.java
View File

@@ -1154,7 +1154,7 @@ public class Character extends AbstractCharacterObject {
if (this.guildid > 0) {
getGuild().broadcast(PacketCreator.jobMessage(0, job.getId(), name), this.getId());
}
MapleFamily family = getFamily();
Family family = getFamily();
if (family != null) {
family.broadcast(PacketCreator.jobMessage(1, job.getId(), name), this.getId());
}
@@ -1183,7 +1183,7 @@ public class Character extends AbstractCharacterObject {
public void broadcastAcquaintances(Packet packet) {
buddylist.broadcast(packet, getWorldServer().getPlayerStorage());
MapleFamily family = getFamily();
Family family = getFamily();
if (family != null) {
family.broadcast(packet, id);
}
@@ -4955,7 +4955,7 @@ public class Character extends AbstractCharacterObject {
return fame;
}
public MapleFamily getFamily() {
public Family getFamily() {
if (familyEntry != null) {
return familyEntry.getFamily();
} else {
@@ -10419,7 +10419,7 @@ public class Character extends AbstractCharacterObject {
guild.broadcast(PacketCreator.marriageMessage(0, name));
}
MapleFamily family = this.getFamily();
Family family = this.getFamily();
if (family != null) {
family.broadcast(PacketCreator.marriageMessage(1, name));
}