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

Rename and clean up MaplePartyCharacter

Browse Source
This commit is contained in:
P0nk
2021-09-09 21:45:27 +02:00
parent 714df342d9
commit 63a2aeee10
61 changed files with 179 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/scripting/event/EventInstanceManager.java
View File

@@ -32,8 +32,8 @@ import net.server.audit.locks.factory.MonitoredReadLockFactory;
import net.server.audit.locks.factory.MonitoredReentrantLockFactory;
import net.server.audit.locks.factory.MonitoredWriteLockFactory;
import net.server.coordinator.world.EventRecallCoordinator;
import net.server.world.MaplePartyCharacter;
import net.server.world.Party;
import net.server.world.PartyCharacter;
import scripting.AbstractPlayerInteraction;
import scripting.event.scheduler.EventScriptScheduler;
import server.MapleItemInformationProvider;
@@ -351,7 +351,7 @@ public class EventInstanceManager {
}
public void registerParty(Party party, MapleMap map) {
for (MaplePartyCharacter mpc : party.getEligibleMembers()) {
for (PartyCharacter mpc : party.getEligibleMembers()) {
if (mpc.isOnline()) { // thanks resinate
Character chr = map.getCharacterById(mpc.getId());
if (chr != null) {
@@ -457,7 +457,7 @@ public class EventInstanceManager {
} catch (ScriptException | NoSuchMethodException ex) {} // optional
}
public synchronized void changedLeader(final MaplePartyCharacter ldr) {
public synchronized void changedLeader(final PartyCharacter ldr) {
try {
invokeScriptFunction("changedLeader", EventInstanceManager.this, ldr);
} catch (ScriptException | NoSuchMethodException ex) {

8
src/main/java/scripting/event/EventManager.java
View File

@@ -31,8 +31,8 @@ import net.server.audit.locks.MonitoredReentrantLock;
import net.server.audit.locks.factory.MonitoredReentrantLockFactory;
import net.server.channel.Channel;
import net.server.guild.Guild;
import net.server.world.MaplePartyCharacter;
import net.server.world.Party;
import net.server.world.PartyCharacter;
import net.server.world.World;
import scripting.event.scheduler.EventScriptScheduler;
import server.MapleMarriage;
@@ -702,15 +702,15 @@ public class EventManager {
return false;
}
public List<MaplePartyCharacter> getEligibleParty(Party party) {
public List<PartyCharacter> getEligibleParty(Party party) {
if (party == null) {
return new ArrayList<>();
}
try {
Object o = iv.invokeFunction("getEligibleParty", party.getPartyMembersOnline());
if (o instanceof MaplePartyCharacter[] partyChrs) {
final List<MaplePartyCharacter> eligibleParty = new ArrayList<>(Arrays.asList(partyChrs));
if (o instanceof PartyCharacter[] partyChrs) {
final List<PartyCharacter> eligibleParty = new ArrayList<>(Arrays.asList(partyChrs));
party.setEligibleMembers(eligibleParty);
return eligibleParty;
}