Fix event scripts' getEligibleParty
Cannot return a JavaScript array straight up (otherwise you'll get a PolyglotMap): it has to be converted first from inside the script.
This commit is contained in:
@@ -107,7 +107,7 @@ function getEligibleParty(party) { //selects, from the given party, the tea
|
||||
|
||||
if(!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers && mask == 3)) eligible = [];
|
||||
if(onlyMarriedPlayers && hasNotMarried) eligible = [];
|
||||
return eligible;
|
||||
return Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]'));
|
||||
}
|
||||
|
||||
function setup(level, lobbyid) {
|
||||
|
||||
@@ -103,7 +103,7 @@ function getEligibleParty(party) { //selects, from the given party, the tea
|
||||
}
|
||||
|
||||
if(!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) eligible = [];
|
||||
return eligible;
|
||||
return Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]'));
|
||||
}
|
||||
|
||||
function setup(level, lobbyid) {
|
||||
|
||||
@@ -103,7 +103,7 @@ function getEligibleParty(party) { //selects, from the given party, the tea
|
||||
}
|
||||
|
||||
if(!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) eligible = [];
|
||||
return eligible;
|
||||
return Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]'));
|
||||
}
|
||||
|
||||
function setup(level, lobbyid) {
|
||||
|
||||
@@ -117,7 +117,7 @@ function getEligibleParty(party) { //selects, from the given party, the tea
|
||||
}
|
||||
|
||||
if(!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) eligible = [];
|
||||
return eligible;
|
||||
return Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]'));
|
||||
}
|
||||
|
||||
function setup(level, lobbyid) {
|
||||
|
||||
@@ -100,7 +100,7 @@ function getEligibleParty(party) { //selects, from the given party, the tea
|
||||
}
|
||||
|
||||
if(!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) eligible = [];
|
||||
return eligible;
|
||||
return Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]'));
|
||||
}
|
||||
|
||||
function setup(level, lobbyid) {
|
||||
|
||||
@@ -100,7 +100,7 @@ function getEligibleParty(party) { //selects, from the given party, the tea
|
||||
}
|
||||
|
||||
if(!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) eligible = [];
|
||||
return eligible;
|
||||
return Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]'));
|
||||
}
|
||||
|
||||
function setup(level, lobbyid) {
|
||||
|
||||
@@ -100,7 +100,7 @@ function getEligibleParty(party) { //selects, from the given party, the tea
|
||||
}
|
||||
|
||||
if(!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) eligible = [];
|
||||
return eligible;
|
||||
return Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]'));
|
||||
}
|
||||
|
||||
function setup(level, lobbyid) {
|
||||
|
||||
@@ -100,7 +100,7 @@ function getEligibleParty(party) { //selects, from the given party, the tea
|
||||
}
|
||||
|
||||
if(!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) eligible = [];
|
||||
return eligible;
|
||||
return Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]'));
|
||||
}
|
||||
|
||||
function setup(level, lobbyid) {
|
||||
|
||||
@@ -100,7 +100,7 @@ function getEligibleParty(party) { //selects, from the given party, the tea
|
||||
}
|
||||
|
||||
if(!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) eligible = [];
|
||||
return eligible;
|
||||
return Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]'));
|
||||
}
|
||||
|
||||
function setup(level, lobbyid) {
|
||||
|
||||
@@ -100,7 +100,7 @@ function getEligibleParty(party) { //selects, from the given party, the tea
|
||||
}
|
||||
|
||||
if(!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) eligible = [];
|
||||
return eligible;
|
||||
return Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]'));
|
||||
}
|
||||
|
||||
function setup(level, lobbyid) {
|
||||
|
||||
@@ -80,7 +80,7 @@ function getEligibleParty(party) { //selects, from the given party, the tea
|
||||
}
|
||||
|
||||
if(!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) eligible = [];
|
||||
return eligible;
|
||||
return Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]'));
|
||||
}
|
||||
|
||||
function setup(level, lobbyid) {
|
||||
|
||||
@@ -100,7 +100,7 @@ function getEligibleParty(party) { //selects, from the given party, the tea
|
||||
}
|
||||
|
||||
if(!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) eligible = [];
|
||||
return eligible;
|
||||
return Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]'));
|
||||
}
|
||||
|
||||
function setup(level, lobbyid) {
|
||||
|
||||
@@ -90,7 +90,7 @@ function getEligibleParty(party) { //selects, from the given party, the tea
|
||||
}
|
||||
|
||||
if(!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) eligible = [];
|
||||
return eligible;
|
||||
return Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]'));
|
||||
}
|
||||
|
||||
function setup(level, lobbyid) {
|
||||
|
||||
@@ -80,7 +80,7 @@ function getEligibleParty(party) { //selects, from the given party, the tea
|
||||
}
|
||||
|
||||
if(!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) eligible = [];
|
||||
return eligible;
|
||||
return Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]'));
|
||||
}
|
||||
|
||||
function setup(level, lobbyid) {
|
||||
|
||||
@@ -112,7 +112,7 @@ function getEligibleParty(party) { //selects, from the given party, the tea
|
||||
}
|
||||
|
||||
if(!(hasLeader)) eligible = [];
|
||||
return eligible;
|
||||
return Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]'));
|
||||
}
|
||||
|
||||
function setup(level, lobbyid) {
|
||||
|
||||
@@ -98,7 +98,7 @@ function getEligibleParty(party) { //selects, from the given party, the tea
|
||||
}
|
||||
|
||||
if(!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) eligible = [];
|
||||
return eligible;
|
||||
return Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]'));
|
||||
}
|
||||
|
||||
function setup(level, lobbyid) {
|
||||
|
||||
@@ -110,7 +110,7 @@ function getEligibleParty(party) { //selects, from the given party, the tea
|
||||
}
|
||||
|
||||
if(!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) eligible = [];
|
||||
return eligible;
|
||||
return Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]'));
|
||||
}
|
||||
|
||||
function setup(level, lobbyid) {
|
||||
|
||||
@@ -110,7 +110,7 @@ function getEligibleParty(party) { //selects, from the given party, the tea
|
||||
}
|
||||
|
||||
if(!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) eligible = [];
|
||||
return eligible;
|
||||
return Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]'));
|
||||
}
|
||||
|
||||
function setup(level, lobbyid) {
|
||||
|
||||
@@ -110,7 +110,7 @@ function getEligibleParty(party) { //selects, from the given party, the tea
|
||||
}
|
||||
|
||||
if(!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) eligible = [];
|
||||
return eligible;
|
||||
return Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]'));
|
||||
}
|
||||
|
||||
function setup(level, lobbyid) {
|
||||
|
||||
@@ -98,7 +98,7 @@ function getEligibleParty(party) { //selects, from the given party, the tea
|
||||
}
|
||||
|
||||
if(!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) eligible = [];
|
||||
return eligible;
|
||||
return Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]'));
|
||||
}
|
||||
|
||||
function setup(level, lobbyid) {
|
||||
|
||||
@@ -98,7 +98,7 @@ function getEligibleParty(party) { //selects, from the given party, the tea
|
||||
}
|
||||
|
||||
if(!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) eligible = [];
|
||||
return eligible;
|
||||
return Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]'));
|
||||
}
|
||||
|
||||
function setup(level, lobbyid) {
|
||||
|
||||
@@ -98,7 +98,7 @@ function getEligibleParty(party) { //selects, from the given party, the tea
|
||||
}
|
||||
|
||||
if(!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) eligible = [];
|
||||
return eligible;
|
||||
return Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]'));
|
||||
}
|
||||
|
||||
function setup(level, lobbyid) {
|
||||
|
||||
@@ -98,7 +98,7 @@ function getEligibleParty(party) { //selects, from the given party, the tea
|
||||
}
|
||||
|
||||
if(!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) eligible = [];
|
||||
return eligible;
|
||||
return Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]'));
|
||||
}
|
||||
|
||||
function setup(level, lobbyid) {
|
||||
|
||||
@@ -98,7 +98,7 @@ function getEligibleParty(party) { //selects, from the given party, the tea
|
||||
}
|
||||
|
||||
if(!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) eligible = [];
|
||||
return eligible;
|
||||
return Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]'));
|
||||
}
|
||||
|
||||
function setup(level, lobbyid) {
|
||||
|
||||
@@ -31,7 +31,7 @@ function getEligibleParty(party) { //selects, from the given party, the tea
|
||||
}
|
||||
|
||||
if(!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) eligible = [];
|
||||
return eligible;
|
||||
return Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]'));
|
||||
}
|
||||
|
||||
function setup(difficulty, lobbyId){
|
||||
|
||||
@@ -31,7 +31,7 @@ function getEligibleParty(party) { //selects, from the given party, the tea
|
||||
}
|
||||
|
||||
if(!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) eligible = [];
|
||||
return eligible;
|
||||
return Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]'));
|
||||
}
|
||||
|
||||
function setup(difficulty, lobbyId){
|
||||
|
||||
@@ -98,7 +98,7 @@ function getEligibleParty(party) { //selects, from the given party, the tea
|
||||
}
|
||||
|
||||
if(!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) eligible = [];
|
||||
return eligible;
|
||||
return Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]'));
|
||||
}
|
||||
|
||||
function setup(level, lobbyid) {
|
||||
|
||||
@@ -98,7 +98,7 @@ function getEligibleParty(party) { //selects, from the given party, the tea
|
||||
}
|
||||
|
||||
if(!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) eligible = [];
|
||||
return eligible;
|
||||
return Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]'));
|
||||
}
|
||||
|
||||
function setup(level, lobbyid) {
|
||||
|
||||
@@ -98,7 +98,7 @@ function getEligibleParty(party) { //selects, from the given party, the tea
|
||||
}
|
||||
|
||||
if(!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) eligible = [];
|
||||
return eligible;
|
||||
return Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]'));
|
||||
}
|
||||
|
||||
function setup(level, lobbyid) {
|
||||
|
||||
@@ -98,7 +98,7 @@ function getEligibleParty(party) { //selects, from the given party, the tea
|
||||
}
|
||||
|
||||
if(!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) eligible = [];
|
||||
return eligible;
|
||||
return Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]'));
|
||||
}
|
||||
|
||||
function setup(level, lobbyid) {
|
||||
|
||||
@@ -90,7 +90,7 @@ function getEligibleParty(party) { //selects, from the given party, the tea
|
||||
}
|
||||
|
||||
if(!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) eligible = [];
|
||||
return eligible;
|
||||
return Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]'));
|
||||
}
|
||||
|
||||
function setup(level, lobbyid) {
|
||||
|
||||
@@ -77,7 +77,7 @@ function getEligibleParty(party) { //selects, from the given party, the tea
|
||||
}
|
||||
|
||||
if(!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) eligible = [];
|
||||
return eligible;
|
||||
return Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]'));
|
||||
}
|
||||
|
||||
function setup(level, lobbyid) {
|
||||
|
||||
@@ -100,7 +100,7 @@ function getEligibleParty(party) { //selects, from the given party, the tea
|
||||
}
|
||||
|
||||
if(!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) eligible = [];
|
||||
return eligible;
|
||||
return Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]'));
|
||||
}
|
||||
|
||||
function setup(level, lobbyid) {
|
||||
|
||||
@@ -100,7 +100,7 @@ function getEligibleParty(party) { //selects, from the given party, the tea
|
||||
}
|
||||
|
||||
if(!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) eligible = [];
|
||||
return eligible;
|
||||
return Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]'));
|
||||
}
|
||||
|
||||
function setup(level, lobbyid) {
|
||||
|
||||
@@ -100,7 +100,7 @@ function getEligibleParty(party) { //selects, from the given party, the tea
|
||||
}
|
||||
|
||||
if(!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) eligible = [];
|
||||
return eligible;
|
||||
return Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]'));
|
||||
}
|
||||
|
||||
function setup(level, lobbyid) {
|
||||
|
||||
@@ -100,7 +100,7 @@ function getEligibleParty(party) { //selects, from the given party, the tea
|
||||
}
|
||||
|
||||
if(!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) eligible = [];
|
||||
return eligible;
|
||||
return Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]'));
|
||||
}
|
||||
|
||||
function setup(level, lobbyid) {
|
||||
|
||||
@@ -100,7 +100,7 @@ function getEligibleParty(party) { //selects, from the given party, the tea
|
||||
}
|
||||
|
||||
if(!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) eligible = [];
|
||||
return eligible;
|
||||
return Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]'));
|
||||
}
|
||||
|
||||
function setup(level, lobbyid) {
|
||||
|
||||
@@ -99,7 +99,7 @@ function getEligibleParty(party) { //selects, from the given party, the tea
|
||||
}
|
||||
|
||||
if(!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) eligible = [];
|
||||
return eligible;
|
||||
return Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]'));
|
||||
}
|
||||
|
||||
function setup(level, lobbyid) {
|
||||
|
||||
@@ -98,7 +98,7 @@ function getEligibleParty(party) { //selects, from the given party, the tea
|
||||
}
|
||||
|
||||
if(!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) eligible = [];
|
||||
return eligible;
|
||||
return Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]'));
|
||||
}
|
||||
|
||||
function setup(level, lobbyid) {
|
||||
|
||||
@@ -30,7 +30,7 @@ function getEligibleParty(party) { //selects, from the given party, the tea
|
||||
}
|
||||
|
||||
if(!(hasLeader && eligible.length >= minPlayers)) eligible = [];
|
||||
return eligible;
|
||||
return Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]'));
|
||||
}
|
||||
|
||||
function setup(level, lobbyid) {
|
||||
|
||||
@@ -713,21 +713,21 @@ public class EventManager {
|
||||
|
||||
public List<MaplePartyCharacter> getEligibleParty(MapleParty party) {
|
||||
if (party == null) {
|
||||
return(new ArrayList<>());
|
||||
return new ArrayList<>();
|
||||
}
|
||||
try {
|
||||
Object p = iv.invokeFunction("getEligibleParty", party.getPartyMembersOnline());
|
||||
Object o = iv.invokeFunction("getEligibleParty", party.getPartyMembersOnline());
|
||||
|
||||
if(p != null) {
|
||||
final List<MaplePartyCharacter> lmpc = new ArrayList<>((List<MaplePartyCharacter>) p);
|
||||
party.setEligibleMembers(lmpc);
|
||||
return lmpc;
|
||||
if (o instanceof MaplePartyCharacter[] partyChrs) {
|
||||
final List<MaplePartyCharacter> eligibleParty = new ArrayList<>(Arrays.asList(partyChrs));
|
||||
party.setEligibleMembers(eligibleParty);
|
||||
return eligibleParty;
|
||||
}
|
||||
} catch (ScriptException | NoSuchMethodException ex) {
|
||||
ex.printStackTrace();
|
||||
}
|
||||
|
||||
return(new ArrayList<>());
|
||||
return new ArrayList<>();
|
||||
}
|
||||
|
||||
public void clearPQ(EventInstanceManager eim) {
|
||||
|
||||
Reference in New Issue
Block a user