diff --git a/scripts/event/AmoriaPQ.js b/scripts/event/AmoriaPQ.js index c61e617936..fd1cd3332c 100644 --- a/scripts/event/AmoriaPQ.js +++ b/scripts/event/AmoriaPQ.js @@ -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) { diff --git a/scripts/event/BalrogBattle.js b/scripts/event/BalrogBattle.js index 72b34dcbb9..ff47407fa0 100644 --- a/scripts/event/BalrogBattle.js +++ b/scripts/event/BalrogBattle.js @@ -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) { diff --git a/scripts/event/BalrogBattle_Easy.js b/scripts/event/BalrogBattle_Easy.js index 6c5603ac91..7256aa6fae 100644 --- a/scripts/event/BalrogBattle_Easy.js +++ b/scripts/event/BalrogBattle_Easy.js @@ -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) { diff --git a/scripts/event/BossRushPQ.js b/scripts/event/BossRushPQ.js index ad1bc34473..b7eb5d5988 100644 --- a/scripts/event/BossRushPQ.js +++ b/scripts/event/BossRushPQ.js @@ -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) { diff --git a/scripts/event/CafePQ_1.js b/scripts/event/CafePQ_1.js index b0c29feadd..08793c120e 100644 --- a/scripts/event/CafePQ_1.js +++ b/scripts/event/CafePQ_1.js @@ -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) { diff --git a/scripts/event/CafePQ_2.js b/scripts/event/CafePQ_2.js index bf064b8b90..83c80208c7 100644 --- a/scripts/event/CafePQ_2.js +++ b/scripts/event/CafePQ_2.js @@ -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) { diff --git a/scripts/event/CafePQ_3.js b/scripts/event/CafePQ_3.js index 04ab0a61fc..f9fde5b3dd 100644 --- a/scripts/event/CafePQ_3.js +++ b/scripts/event/CafePQ_3.js @@ -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) { diff --git a/scripts/event/CafePQ_4.js b/scripts/event/CafePQ_4.js index 312958396d..ca130d555d 100644 --- a/scripts/event/CafePQ_4.js +++ b/scripts/event/CafePQ_4.js @@ -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) { diff --git a/scripts/event/CafePQ_5.js b/scripts/event/CafePQ_5.js index 4e536f35ee..93feb547ca 100644 --- a/scripts/event/CafePQ_5.js +++ b/scripts/event/CafePQ_5.js @@ -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) { diff --git a/scripts/event/CafePQ_6.js b/scripts/event/CafePQ_6.js index d698ff99d9..06f13f52f0 100644 --- a/scripts/event/CafePQ_6.js +++ b/scripts/event/CafePQ_6.js @@ -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) { diff --git a/scripts/event/DelliBattle.js b/scripts/event/DelliBattle.js index 327ab2778c..faedb4600f 100644 --- a/scripts/event/DelliBattle.js +++ b/scripts/event/DelliBattle.js @@ -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) { diff --git a/scripts/event/ElementalBattle.js b/scripts/event/ElementalBattle.js index 17ee7b3a59..6af9cf2363 100644 --- a/scripts/event/ElementalBattle.js +++ b/scripts/event/ElementalBattle.js @@ -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) { diff --git a/scripts/event/EllinPQ.js b/scripts/event/EllinPQ.js index 0ccda9903c..a7829edd59 100644 --- a/scripts/event/EllinPQ.js +++ b/scripts/event/EllinPQ.js @@ -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) { diff --git a/scripts/event/ElnathPQ.js b/scripts/event/ElnathPQ.js index fd4d56a424..d3339e1b5b 100644 --- a/scripts/event/ElnathPQ.js +++ b/scripts/event/ElnathPQ.js @@ -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) { diff --git a/scripts/event/GuildQuest.js b/scripts/event/GuildQuest.js index 4a942f1407..837803481f 100644 --- a/scripts/event/GuildQuest.js +++ b/scripts/event/GuildQuest.js @@ -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) { diff --git a/scripts/event/HenesysPQ.js b/scripts/event/HenesysPQ.js index a2544bca81..7ba1973d72 100644 --- a/scripts/event/HenesysPQ.js +++ b/scripts/event/HenesysPQ.js @@ -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) { diff --git a/scripts/event/HolidayPQ_1.js b/scripts/event/HolidayPQ_1.js index 5e193a992b..b1a9d201ae 100644 --- a/scripts/event/HolidayPQ_1.js +++ b/scripts/event/HolidayPQ_1.js @@ -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) { diff --git a/scripts/event/HolidayPQ_2.js b/scripts/event/HolidayPQ_2.js index 3b3dddf780..621a0b9d0c 100644 --- a/scripts/event/HolidayPQ_2.js +++ b/scripts/event/HolidayPQ_2.js @@ -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) { diff --git a/scripts/event/HolidayPQ_3.js b/scripts/event/HolidayPQ_3.js index b25b3a1998..6c87a86f3f 100644 --- a/scripts/event/HolidayPQ_3.js +++ b/scripts/event/HolidayPQ_3.js @@ -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) { diff --git a/scripts/event/HorntailPQ.js b/scripts/event/HorntailPQ.js index 7dddb408f9..cd2dedab66 100644 --- a/scripts/event/HorntailPQ.js +++ b/scripts/event/HorntailPQ.js @@ -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) { diff --git a/scripts/event/KerningPQ.js b/scripts/event/KerningPQ.js index 81837f319b..9b3e8fb982 100644 --- a/scripts/event/KerningPQ.js +++ b/scripts/event/KerningPQ.js @@ -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) { diff --git a/scripts/event/LatanicaBattle.js b/scripts/event/LatanicaBattle.js index f9d82b4df9..249f466d52 100644 --- a/scripts/event/LatanicaBattle.js +++ b/scripts/event/LatanicaBattle.js @@ -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) { diff --git a/scripts/event/LudiMazePQ.js b/scripts/event/LudiMazePQ.js index 183e2d4cda..525d739a66 100644 --- a/scripts/event/LudiMazePQ.js +++ b/scripts/event/LudiMazePQ.js @@ -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) { diff --git a/scripts/event/LudiPQ.js b/scripts/event/LudiPQ.js index 6e9e4577f5..4e1e5745ac 100644 --- a/scripts/event/LudiPQ.js +++ b/scripts/event/LudiPQ.js @@ -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) { diff --git a/scripts/event/MK_PrimeMinister.js b/scripts/event/MK_PrimeMinister.js index 93e5ec2742..73202b1102 100644 --- a/scripts/event/MK_PrimeMinister.js +++ b/scripts/event/MK_PrimeMinister.js @@ -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){ diff --git a/scripts/event/MK_PrimeMinister2.js b/scripts/event/MK_PrimeMinister2.js index dc64c4e0e7..e1539ba7d7 100644 --- a/scripts/event/MK_PrimeMinister2.js +++ b/scripts/event/MK_PrimeMinister2.js @@ -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){ diff --git a/scripts/event/MagatiaPQ_A.js b/scripts/event/MagatiaPQ_A.js index b96be131ae..42abb23f37 100644 --- a/scripts/event/MagatiaPQ_A.js +++ b/scripts/event/MagatiaPQ_A.js @@ -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) { diff --git a/scripts/event/MagatiaPQ_Z.js b/scripts/event/MagatiaPQ_Z.js index 45ca08e720..c69ee97382 100644 --- a/scripts/event/MagatiaPQ_Z.js +++ b/scripts/event/MagatiaPQ_Z.js @@ -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) { diff --git a/scripts/event/OrbisPQ.js b/scripts/event/OrbisPQ.js index 326ce442f9..b7543c0a51 100644 --- a/scripts/event/OrbisPQ.js +++ b/scripts/event/OrbisPQ.js @@ -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) { diff --git a/scripts/event/PapulatusBattle.js b/scripts/event/PapulatusBattle.js index 6ff9c0dfd6..08511c95cd 100644 --- a/scripts/event/PapulatusBattle.js +++ b/scripts/event/PapulatusBattle.js @@ -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) { diff --git a/scripts/event/PiratePQ.js b/scripts/event/PiratePQ.js index 89e857b9bb..05ec57ee6b 100644 --- a/scripts/event/PiratePQ.js +++ b/scripts/event/PiratePQ.js @@ -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) { diff --git a/scripts/event/RescueGaga.js b/scripts/event/RescueGaga.js index 48c662c2e6..89e784db39 100644 --- a/scripts/event/RescueGaga.js +++ b/scripts/event/RescueGaga.js @@ -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) { diff --git a/scripts/event/TD_Battle1.js b/scripts/event/TD_Battle1.js index 8a315f875c..18ea69ab6b 100644 --- a/scripts/event/TD_Battle1.js +++ b/scripts/event/TD_Battle1.js @@ -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) { diff --git a/scripts/event/TD_Battle2.js b/scripts/event/TD_Battle2.js index 288af85fe5..350bdc9738 100644 --- a/scripts/event/TD_Battle2.js +++ b/scripts/event/TD_Battle2.js @@ -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) { diff --git a/scripts/event/TD_Battle3.js b/scripts/event/TD_Battle3.js index 6589961695..1eab11205e 100644 --- a/scripts/event/TD_Battle3.js +++ b/scripts/event/TD_Battle3.js @@ -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) { diff --git a/scripts/event/TD_Battle4.js b/scripts/event/TD_Battle4.js index 6f8dee69d4..b7dd66fb83 100644 --- a/scripts/event/TD_Battle4.js +++ b/scripts/event/TD_Battle4.js @@ -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) { diff --git a/scripts/event/TD_Battle5.js b/scripts/event/TD_Battle5.js index 53f0f2b88d..86b4fcaa07 100644 --- a/scripts/event/TD_Battle5.js +++ b/scripts/event/TD_Battle5.js @@ -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) { diff --git a/scripts/event/TreasurePQ.js b/scripts/event/TreasurePQ.js index 5624044b7e..88252dcdf2 100644 --- a/scripts/event/TreasurePQ.js +++ b/scripts/event/TreasurePQ.js @@ -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) { diff --git a/scripts/event/ZakumPQ.js b/scripts/event/ZakumPQ.js index 9f69ca4476..07175811dc 100644 --- a/scripts/event/ZakumPQ.js +++ b/scripts/event/ZakumPQ.js @@ -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) { diff --git a/scripts/event/s4aWorld.js b/scripts/event/s4aWorld.js index 24867aaa3b..d14de547c7 100644 --- a/scripts/event/s4aWorld.js +++ b/scripts/event/s4aWorld.js @@ -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) { diff --git a/src/main/java/scripting/event/EventManager.java b/src/main/java/scripting/event/EventManager.java index 550ee3b79e..272570f2ef 100644 --- a/src/main/java/scripting/event/EventManager.java +++ b/src/main/java/scripting/event/EventManager.java @@ -713,21 +713,21 @@ public class EventManager { public List 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 lmpc = new ArrayList<>((List) p); - party.setEligibleMembers(lmpc); - return lmpc; + if (o instanceof MaplePartyCharacter[] partyChrs) { + final List 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) {