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

Rename and clean up MapleParty

Browse Source
This commit is contained in:
P0nk
2021-09-09 21:44:09 +02:00
parent 5aa0368090
commit 714df342d9
24 changed files with 157 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/server/maps/MapleDoorObject.java
View File

@@ -27,7 +27,7 @@ import net.server.audit.locks.MonitoredReentrantReadWriteLock;
import net.server.audit.locks.MonitoredWriteLock;
import net.server.audit.locks.factory.MonitoredReadLockFactory;
import net.server.audit.locks.factory.MonitoredWriteLockFactory;
import net.server.world.MapleParty;
import net.server.world.Party;
import tools.PacketCreator;
import java.awt.*;
@@ -89,7 +89,7 @@ public class MapleDoorObject extends AbstractMapleMapObject {
}
public void warp(final Character chr) {
MapleParty party = chr.getParty();
Party party = chr.getParty();
if (chr.getId() == ownerId || (party != null && party.getMemberById(ownerId) != null)) {
chr.sendPacket(PacketCreator.playPortalSound());
@@ -127,7 +127,7 @@ public class MapleDoorObject extends AbstractMapleMapObject {
public void sendDestroyData(Client client) {
Character chr = client.getPlayer();
if (from.getId() == chr.getMapId()) {
MapleParty party = chr.getParty();
Party party = chr.getParty();
if (party != null && (ownerId == chr.getId() || party.getMemberById(ownerId) != null)) {
client.sendPacket(PacketCreator.partyPortal(999999999, 999999999, new Point(-1, -1)));
}

6
src/main/java/server/maps/MapleMap.java
View File

@@ -49,7 +49,7 @@ import net.server.services.task.channel.FaceExpressionService;
import net.server.services.task.channel.MobMistService;
import net.server.services.task.channel.OverallService;
import net.server.services.type.ChannelServices;
import net.server.world.MapleParty;
import net.server.world.Party;
import net.server.world.World;
import scripting.event.EventInstanceManager;
import scripting.map.MapScriptManager;
@@ -2354,7 +2354,7 @@ public class MapleMap {
public void addPlayer(final Character chr) {
int chrSize;
MapleParty party = chr.getParty();
Party party = chr.getParty();
chrWLock.lock();
try {
characters.add(chr);
@@ -2668,7 +2668,7 @@ public class MapleMap {
service.unregisterFaceExpression(mapid, chr);
chr.unregisterChairBuff();
MapleParty party = chr.getParty();
Party party = chr.getParty();
chrWLock.lock();
try {
if (party != null && party.getMemberById(chr.getId()) != null) {