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

10
src/main/java/net/server/world/World.java
View File

@@ -26,7 +26,7 @@ import client.BuddyList.BuddyAddResult;
import client.BuddyList.BuddyOperation;
import client.BuddylistEntry;
import client.Character;
import client.MapleFamily;
import client.Family;
import config.YamlConfig;
import constants.game.GameConstants;
import net.packet.Packet;
@@ -82,7 +82,7 @@ public class World {
private Map<Integer, Short> pnpcPodium = new HashMap<>();
private Map<Integer, MapleMessenger> messengers = new HashMap<>();
private AtomicInteger runningMessengerId = new AtomicInteger();
private Map<Integer, MapleFamily> families = new LinkedHashMap<>();
private Map<Integer, Family> families = new LinkedHashMap<>();
private Map<Integer, Integer> relationships = new HashMap<>();
private Map<Integer, Pair<Integer, Integer>> relationshipCouples = new HashMap<>();
private Map<Integer, MapleGuildSummary> gsStore = new HashMap<>();
@@ -547,7 +547,7 @@ public class World {
return id;
}
public void addFamily(int id, MapleFamily f) {
public void addFamily(int id, Family f) {
synchronized (families) {
if (!families.containsKey(id)) {
families.put(id, f);
@@ -561,7 +561,7 @@ public class World {
}
}
public MapleFamily getFamily(int id) {
public Family getFamily(int id) {
synchronized (families) {
if (families.containsKey(id)) {
return families.get(id);
@@ -570,7 +570,7 @@ public class World {
}
}
public Collection<MapleFamily> getFamilies() {
public Collection<Family> getFamilies() {
synchronized(families) {
return Collections.unmodifiableCollection(families.values());
}