From 63a2aeee10df361c8f47949ea9847289d191c4b9 Mon Sep 17 00:00:00 2001 From: P0nk Date: Thu, 9 Sep 2021 21:45:27 +0200 Subject: [PATCH] Rename and clean up MaplePartyCharacter --- scripts/event/AmoriaPQ.js | 2 +- scripts/event/BalrogBattle.js | 2 +- scripts/event/BalrogBattle_Easy.js | 2 +- scripts/event/BossRushPQ.js | 2 +- scripts/event/CafePQ_1.js | 2 +- scripts/event/CafePQ_2.js | 2 +- scripts/event/CafePQ_3.js | 2 +- scripts/event/CafePQ_4.js | 2 +- scripts/event/CafePQ_5.js | 2 +- scripts/event/CafePQ_6.js | 2 +- scripts/event/DelliBattle.js | 2 +- scripts/event/ElementalBattle.js | 2 +- scripts/event/EllinPQ.js | 2 +- scripts/event/ElnathPQ.js | 2 +- scripts/event/GuildQuest.js | 2 +- scripts/event/HenesysPQ.js | 2 +- scripts/event/HolidayPQ_1.js | 2 +- scripts/event/HolidayPQ_2.js | 2 +- scripts/event/HolidayPQ_3.js | 2 +- scripts/event/HorntailPQ.js | 2 +- scripts/event/KerningPQ.js | 2 +- scripts/event/LatanicaBattle.js | 2 +- scripts/event/LudiMazePQ.js | 2 +- scripts/event/LudiPQ.js | 2 +- scripts/event/MK_PrimeMinister.js | 2 +- scripts/event/MK_PrimeMinister2.js | 2 +- scripts/event/MagatiaPQ_A.js | 2 +- scripts/event/MagatiaPQ_Z.js | 2 +- scripts/event/OrbisPQ.js | 2 +- scripts/event/PapulatusBattle.js | 2 +- scripts/event/PiratePQ.js | 2 +- scripts/event/RescueGaga.js | 2 +- scripts/event/TD_Battle1.js | 2 +- scripts/event/TD_Battle2.js | 2 +- scripts/event/TD_Battle3.js | 2 +- scripts/event/TD_Battle4.js | 2 +- scripts/event/TD_Battle5.js | 2 +- scripts/event/TreasurePQ.js | 2 +- scripts/event/ZakumPQ.js | 2 +- scripts/event/s4aWorld.js | 2 +- src/main/java/client/Character.java | 18 +++--- src/main/java/client/Client.java | 6 +- src/main/java/net/server/channel/Channel.java | 4 +- .../handlers/MonsterCarnivalHandler.java | 4 +- .../handlers/PartyOperationHandler.java | 4 +- .../handlers/PlayerLoggedinHandler.java | 4 +- .../listener/MatchCheckerCPQChallenge.java | 6 +- src/main/java/net/server/guild/Alliance.java | 4 +- src/main/java/net/server/world/Party.java | 56 +++++++++---------- ...artyCharacter.java => PartyCharacter.java} | 35 +++++------- src/main/java/net/server/world/World.java | 18 +++--- .../scripting/AbstractPlayerInteraction.java | 8 +-- .../scripting/event/EventInstanceManager.java | 6 +- .../java/scripting/event/EventManager.java | 8 +-- .../scripting/npc/NPCConversationManager.java | 32 +++++------ .../java/scripting/npc/NPCScriptManager.java | 4 +- src/main/java/server/MapleStatEffect.java | 4 +- src/main/java/server/life/MapleMonster.java | 4 +- .../server/partyquest/MonsterCarnival.java | 30 +++++----- .../java/server/partyquest/PartyQuest.java | 6 +- src/main/java/tools/PacketCreator.java | 22 ++++---- 61 files changed, 179 insertions(+), 184 deletions(-) rename src/main/java/net/server/world/{MaplePartyCharacter.java => PartyCharacter.java} (86%) diff --git a/scripts/event/AmoriaPQ.js b/scripts/event/AmoriaPQ.js index 08683d08c0..c45b0e8ae7 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 Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]')); + return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); } function setup(level, lobbyid) { diff --git a/scripts/event/BalrogBattle.js b/scripts/event/BalrogBattle.js index 1ebd80265b..b17d925670 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 Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]')); + return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); } function setup(level, lobbyid) { diff --git a/scripts/event/BalrogBattle_Easy.js b/scripts/event/BalrogBattle_Easy.js index e6efb9956b..579b1442ed 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 Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]')); + return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); } function setup(level, lobbyid) { diff --git a/scripts/event/BossRushPQ.js b/scripts/event/BossRushPQ.js index 81cfd89f80..e79f17f81b 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 Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]')); + return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); } function setup(level, lobbyid) { diff --git a/scripts/event/CafePQ_1.js b/scripts/event/CafePQ_1.js index f7c71bb70c..3838da01ff 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 Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]')); + return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); } function setup(level, lobbyid) { diff --git a/scripts/event/CafePQ_2.js b/scripts/event/CafePQ_2.js index 6843fe1240..dfa7d6cd70 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 Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]')); + return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); } function setup(level, lobbyid) { diff --git a/scripts/event/CafePQ_3.js b/scripts/event/CafePQ_3.js index 82aefc9b42..2756114c48 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 Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]')); + return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); } function setup(level, lobbyid) { diff --git a/scripts/event/CafePQ_4.js b/scripts/event/CafePQ_4.js index 2d4aca90f0..330180dfb0 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 Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]')); + return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); } function setup(level, lobbyid) { diff --git a/scripts/event/CafePQ_5.js b/scripts/event/CafePQ_5.js index 4e2f36a319..57b2fd8ff8 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 Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]')); + return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); } function setup(level, lobbyid) { diff --git a/scripts/event/CafePQ_6.js b/scripts/event/CafePQ_6.js index 50c1d4bc9c..9dde1e421e 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 Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]')); + return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); } function setup(level, lobbyid) { diff --git a/scripts/event/DelliBattle.js b/scripts/event/DelliBattle.js index b21edef43d..1238842e37 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 Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]')); + return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); } function setup(level, lobbyid) { diff --git a/scripts/event/ElementalBattle.js b/scripts/event/ElementalBattle.js index f286ae6564..48e238c90e 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 Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]')); + return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); } function setup(level, lobbyid) { diff --git a/scripts/event/EllinPQ.js b/scripts/event/EllinPQ.js index 51501e6cb0..ac5608cb43 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 Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]')); + return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); } function setup(level, lobbyid) { diff --git a/scripts/event/ElnathPQ.js b/scripts/event/ElnathPQ.js index 082d16178b..37f3530b71 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 Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]')); + return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); } function setup(level, lobbyid) { diff --git a/scripts/event/GuildQuest.js b/scripts/event/GuildQuest.js index 2e60a73214..796ac62b7d 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 Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]')); + return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); } function setup(level, lobbyid) { diff --git a/scripts/event/HenesysPQ.js b/scripts/event/HenesysPQ.js index 4a6ccc0098..f9c3bfed64 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 Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]')); + return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); } function setup(level, lobbyid) { diff --git a/scripts/event/HolidayPQ_1.js b/scripts/event/HolidayPQ_1.js index 68920209b6..255947270e 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 Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]')); + return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); } function setup(level, lobbyid) { diff --git a/scripts/event/HolidayPQ_2.js b/scripts/event/HolidayPQ_2.js index 954c677c0d..002de505a3 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 Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]')); + return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); } function setup(level, lobbyid) { diff --git a/scripts/event/HolidayPQ_3.js b/scripts/event/HolidayPQ_3.js index e08173bd6a..4a31818dc2 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 Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]')); + return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); } function setup(level, lobbyid) { diff --git a/scripts/event/HorntailPQ.js b/scripts/event/HorntailPQ.js index c7ae6d4f0d..fc194b60b8 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 Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]')); + return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); } function setup(level, lobbyid) { diff --git a/scripts/event/KerningPQ.js b/scripts/event/KerningPQ.js index f0aefe454d..22a2ae0473 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 Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]')); + return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); } function setup(level, lobbyid) { diff --git a/scripts/event/LatanicaBattle.js b/scripts/event/LatanicaBattle.js index 40a63c8c22..12f8471f2b 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 Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]')); + return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); } function setup(level, lobbyid) { diff --git a/scripts/event/LudiMazePQ.js b/scripts/event/LudiMazePQ.js index 475c54f25f..c7db87e9f6 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 Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]')); + return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); } function setup(level, lobbyid) { diff --git a/scripts/event/LudiPQ.js b/scripts/event/LudiPQ.js index eaea40f276..540ae3e889 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 Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]')); + return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); } function setup(level, lobbyid) { diff --git a/scripts/event/MK_PrimeMinister.js b/scripts/event/MK_PrimeMinister.js index 73202b1102..a26144cabb 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 Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]')); + return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); } function setup(difficulty, lobbyId){ diff --git a/scripts/event/MK_PrimeMinister2.js b/scripts/event/MK_PrimeMinister2.js index e1539ba7d7..b1ceb9b43c 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 Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]')); + return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); } function setup(difficulty, lobbyId){ diff --git a/scripts/event/MagatiaPQ_A.js b/scripts/event/MagatiaPQ_A.js index e4216b7446..d732c0dfda 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 Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]')); + return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); } function setup(level, lobbyid) { diff --git a/scripts/event/MagatiaPQ_Z.js b/scripts/event/MagatiaPQ_Z.js index ec12baa753..14fb5421b4 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 Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]')); + return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); } function setup(level, lobbyid) { diff --git a/scripts/event/OrbisPQ.js b/scripts/event/OrbisPQ.js index 8d71fd512b..6078289d95 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 Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]')); + return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); } function setup(level, lobbyid) { diff --git a/scripts/event/PapulatusBattle.js b/scripts/event/PapulatusBattle.js index f75d082f30..7144c2d5cb 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 Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]')); + return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); } function setup(level, lobbyid) { diff --git a/scripts/event/PiratePQ.js b/scripts/event/PiratePQ.js index 8fdd9c0664..e6beb4b594 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 Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]')); + return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); } function setup(level, lobbyid) { diff --git a/scripts/event/RescueGaga.js b/scripts/event/RescueGaga.js index 99b80fe97a..146d03cdc6 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 Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]')); + return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); } function setup(level, lobbyid) { diff --git a/scripts/event/TD_Battle1.js b/scripts/event/TD_Battle1.js index 3ca55f6b37..c73d9d0934 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 Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]')); + return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); } function setup(level, lobbyid) { diff --git a/scripts/event/TD_Battle2.js b/scripts/event/TD_Battle2.js index b893fe4949..165f274238 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 Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]')); + return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); } function setup(level, lobbyid) { diff --git a/scripts/event/TD_Battle3.js b/scripts/event/TD_Battle3.js index 175deb3925..33dc52a562 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 Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]')); + return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); } function setup(level, lobbyid) { diff --git a/scripts/event/TD_Battle4.js b/scripts/event/TD_Battle4.js index e7e3b15bd6..ead9fb4927 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 Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]')); + return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); } function setup(level, lobbyid) { diff --git a/scripts/event/TD_Battle5.js b/scripts/event/TD_Battle5.js index b5ecaf12d3..41c97bfec0 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 Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]')); + return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); } function setup(level, lobbyid) { diff --git a/scripts/event/TreasurePQ.js b/scripts/event/TreasurePQ.js index 10c89e8757..1f2560ef85 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 Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]')); + return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); } function setup(level, lobbyid) { diff --git a/scripts/event/ZakumPQ.js b/scripts/event/ZakumPQ.js index a823ab16cf..111855f747 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 Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]')); + return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); } function setup(level, lobbyid) { diff --git a/scripts/event/s4aWorld.js b/scripts/event/s4aWorld.js index d14de547c7..2af88c7a84 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 Java.to(eligible, Java.type('net.server.world.MaplePartyCharacter[]')); + return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); } function setup(level, lobbyid) { diff --git a/src/main/java/client/Character.java b/src/main/java/client/Character.java index 3804ce988b..52ab7f1402 100644 --- a/src/main/java/client/Character.java +++ b/src/main/java/client/Character.java @@ -154,7 +154,7 @@ public class Character extends AbstractCharacterObject { private MapleHiredMerchant hiredMerchant = null; private Client client; private GuildCharacter mgc = null; - private MaplePartyCharacter mpc = null; + private PartyCharacter mpc = null; private Inventory[] inventory; private Job job = Job.BEGINNER; private Messenger messenger = null; @@ -1143,7 +1143,7 @@ public class Character extends AbstractCharacterObject { effLock.unlock(); } - setMPC(new MaplePartyCharacter(this)); + setMPC(new PartyCharacter(this)); silentPartyUpdate(); if (dragon != null) { @@ -5297,14 +5297,14 @@ public class Character extends AbstractCharacterObject { this.mgc = mgc; } - public MaplePartyCharacter getMPC() { + public PartyCharacter getMPC() { if (mpc == null) { - mpc = new MaplePartyCharacter(this); + mpc = new PartyCharacter(this); } return mpc; } - public void setMPC(MaplePartyCharacter mpc) { + public void setMPC(PartyCharacter mpc) { this.mpc = mpc; } @@ -5437,7 +5437,7 @@ public class Character extends AbstractCharacterObject { prtLock.lock(); try { if (party != null) { - for (MaplePartyCharacter mpc : party.getMembers()) { + for (PartyCharacter mpc : party.getMembers()) { Character mc = mpc.getPlayer(); if (mc != null) { list.add(mc); @@ -5458,7 +5458,7 @@ public class Character extends AbstractCharacterObject { prtLock.lock(); try { if (party != null) { - for (MaplePartyCharacter mpc : party.getMembers()) { + for (PartyCharacter mpc : party.getMembers()) { Character chr = mpc.getPlayer(); if (chr != null) { MapleMap chrMap = chr.getMap(); @@ -6450,7 +6450,7 @@ public class Character extends AbstractCharacterObject { } getMap().broadcastMessage(this, PacketCreator.showForeignEffect(getId(), 0), false); - setMPC(new MaplePartyCharacter(this)); + setMPC(new PartyCharacter(this)); silentPartyUpdate(); if (this.guildid > 0) { @@ -7131,7 +7131,7 @@ public class Character extends AbstractCharacterObject { if (party != null) { ret.mpc = party.getMemberById(ret.id); if (ret.mpc != null) { - ret.mpc = new MaplePartyCharacter(ret); + ret.mpc = new PartyCharacter(ret); ret.party = party; } } diff --git a/src/main/java/client/Client.java b/src/main/java/client/Client.java index 04af360fbc..fb0bc3db07 100644 --- a/src/main/java/client/Client.java +++ b/src/main/java/client/Client.java @@ -882,12 +882,12 @@ public class Client extends ChannelInboundHandlerAdapter { final int idz = player.getId(); if (party != null) { - final MaplePartyCharacter chrp = new MaplePartyCharacter(player); + final PartyCharacter chrp = new PartyCharacter(player); chrp.setOnline(false); wserv.updateParty(party.getId(), PartyOperation.LOG_ONOFF, chrp); if (party.getLeader().getId() == idz && map != null) { - MaplePartyCharacter lchr = null; - for (MaplePartyCharacter pchr : party.getMembers()) { + PartyCharacter lchr = null; + for (PartyCharacter pchr : party.getMembers()) { if (pchr != null && pchr.getId() != idz && (lchr == null || lchr.getLevel() <= pchr.getLevel()) && map.getCharacterById(pchr.getId()) != null) { lchr = pchr; } diff --git a/src/main/java/net/server/channel/Channel.java b/src/main/java/net/server/channel/Channel.java index 84b7a0edea..b28210df81 100644 --- a/src/main/java/net/server/channel/Channel.java +++ b/src/main/java/net/server/channel/Channel.java @@ -36,8 +36,8 @@ import net.server.audit.locks.factory.MonitoredWriteLockFactory; import net.server.services.BaseService; import net.server.services.ServicesManager; import net.server.services.type.ChannelServices; -import net.server.world.MaplePartyCharacter; import net.server.world.Party; +import net.server.world.PartyCharacter; import net.server.world.World; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -319,7 +319,7 @@ public final class Channel { public List getPartyMembers(Party party) { List partym = new ArrayList<>(8); - for (MaplePartyCharacter partychar : party.getMembers()) { + for (PartyCharacter partychar : party.getMembers()) { if (partychar.getChannel() == getId()) { Character chr = getPlayerStorage().getCharacterByName(partychar.getName()); if (chr != null) { diff --git a/src/main/java/net/server/channel/handlers/MonsterCarnivalHandler.java b/src/main/java/net/server/channel/handlers/MonsterCarnivalHandler.java index f9eb15b558..ed71ea960f 100644 --- a/src/main/java/net/server/channel/handlers/MonsterCarnivalHandler.java +++ b/src/main/java/net/server/channel/handlers/MonsterCarnivalHandler.java @@ -26,8 +26,8 @@ import client.Client; import client.Disease; import net.AbstractPacketHandler; import net.packet.InPacket; -import net.server.world.MaplePartyCharacter; import net.server.world.Party; +import net.server.world.PartyCharacter; import server.life.MapleLifeFactory; import server.life.MapleMonster; import server.partyquest.MapleCarnivalFactory; @@ -107,7 +107,7 @@ public final class MonsterCarnivalHandler extends AbstractPacketHandler { hitChance = (int) (Math.random() * 100); } if (hitChance <= 80) { - for (MaplePartyCharacter mpc : enemies.getPartyMembers()) { + for (PartyCharacter mpc : enemies.getPartyMembers()) { Character mc = mpc.getPlayer(); if (mc != null) { if (dis == null) { diff --git a/src/main/java/net/server/channel/handlers/PartyOperationHandler.java b/src/main/java/net/server/channel/handlers/PartyOperationHandler.java index 123df4889f..a2690d2801 100644 --- a/src/main/java/net/server/channel/handlers/PartyOperationHandler.java +++ b/src/main/java/net/server/channel/handlers/PartyOperationHandler.java @@ -30,8 +30,8 @@ import net.server.coordinator.world.InviteCoordinator; import net.server.coordinator.world.InviteCoordinator.InviteResult; import net.server.coordinator.world.InviteCoordinator.InviteType; import net.server.coordinator.world.InviteCoordinator.MapleInviteResult; -import net.server.world.MaplePartyCharacter; import net.server.world.Party; +import net.server.world.PartyCharacter; import net.server.world.PartyOperation; import net.server.world.World; import tools.PacketCreator; @@ -118,7 +118,7 @@ public final class PartyOperationHandler extends AbstractPacketHandler { } case 6: { // change leader int newLeader = p.readInt(); - MaplePartyCharacter newLeadr = party.getMemberById(newLeader); + PartyCharacter newLeadr = party.getMemberById(newLeader); world.updateParty(party.getId(), PartyOperation.CHANGE_LEADER, newLeadr); break; } diff --git a/src/main/java/net/server/channel/handlers/PlayerLoggedinHandler.java b/src/main/java/net/server/channel/handlers/PlayerLoggedinHandler.java index dee1c48b5c..55784517ba 100644 --- a/src/main/java/net/server/channel/handlers/PlayerLoggedinHandler.java +++ b/src/main/java/net/server/channel/handlers/PlayerLoggedinHandler.java @@ -39,7 +39,7 @@ import net.server.coordinator.world.EventRecallCoordinator; import net.server.guild.Alliance; import net.server.guild.Guild; import net.server.guild.GuildPackets; -import net.server.world.MaplePartyCharacter; +import net.server.world.PartyCharacter; import net.server.world.PartyOperation; import net.server.world.World; import scripting.event.EventInstanceManager; @@ -303,7 +303,7 @@ public final class PlayerLoggedinHandler extends AbstractPacketHandler { player.showNote(); if (player.getParty() != null) { - MaplePartyCharacter pchar = player.getMPC(); + PartyCharacter pchar = player.getMPC(); //Use this in case of enabling party HPbar HUD when logging in, however "you created a party" will appear on chat. //c.sendPacket(PacketCreator.partyCreated(pchar)); diff --git a/src/main/java/net/server/coordinator/matchchecker/listener/MatchCheckerCPQChallenge.java b/src/main/java/net/server/coordinator/matchchecker/listener/MatchCheckerCPQChallenge.java index ac884cc6f0..1681cc4ca8 100644 --- a/src/main/java/net/server/coordinator/matchchecker/listener/MatchCheckerCPQChallenge.java +++ b/src/main/java/net/server/coordinator/matchchecker/listener/MatchCheckerCPQChallenge.java @@ -23,7 +23,7 @@ import client.Character; import constants.string.LanguageConstants; import net.server.coordinator.matchchecker.AbstractMatchCheckerListener; import net.server.coordinator.matchchecker.MatchCheckerListenerRecipe; -import net.server.world.MaplePartyCharacter; +import net.server.world.PartyCharacter; import scripting.npc.NPCConversationManager; import scripting.npc.NPCScriptManager; @@ -70,8 +70,8 @@ public class MatchCheckerCPQChallenge implements MatchCheckerListenerRecipe { Character chr = leader; - List chrMembers = new LinkedList<>(); - for (MaplePartyCharacter mpc : chr.getParty().getMembers()) { + List chrMembers = new LinkedList<>(); + for (PartyCharacter mpc : chr.getParty().getMembers()) { if (mpc.isOnline()) { chrMembers.add(mpc); } diff --git a/src/main/java/net/server/guild/Alliance.java b/src/main/java/net/server/guild/Alliance.java index 9831a294cb..9286d1b9d8 100644 --- a/src/main/java/net/server/guild/Alliance.java +++ b/src/main/java/net/server/guild/Alliance.java @@ -28,8 +28,8 @@ import net.server.Server; import net.server.coordinator.world.InviteCoordinator; import net.server.coordinator.world.InviteCoordinator.InviteType; import net.server.coordinator.world.InviteCoordinator.MapleInviteResult; -import net.server.world.MaplePartyCharacter; import net.server.world.Party; +import net.server.world.PartyCharacter; import tools.DatabaseConnection; import java.sql.Connection; @@ -86,7 +86,7 @@ public class Alliance { private static List getPartyGuildMasters(Party party) { List mcl = new LinkedList<>(); - for (MaplePartyCharacter mpc : party.getMembers()) { + for (PartyCharacter mpc : party.getMembers()) { Character chr = mpc.getPlayer(); if (chr != null) { Character lchr = party.getLeader().getPlayer(); diff --git a/src/main/java/net/server/world/Party.java b/src/main/java/net/server/world/Party.java index 0137fbeb54..abc573b1bb 100644 --- a/src/main/java/net/server/world/Party.java +++ b/src/main/java/net/server/world/Party.java @@ -44,8 +44,8 @@ public class Party { private int id; private Party enemy = null; private int leaderId; - private final List members = new LinkedList<>(); - private List pqMembers = null; + private final List members = new LinkedList<>(); + private List pqMembers = null; private final Map histMembers = new HashMap<>(); private int nextEntry = 0; @@ -54,12 +54,12 @@ public class Party { private MonitoredReentrantLock lock = MonitoredReentrantLockFactory.createLock(MonitoredLockType.PARTY, true); - public Party(int id, MaplePartyCharacter chrfor) { + public Party(int id, PartyCharacter chrfor) { this.leaderId = chrfor.getId(); this.id = id; } - public boolean containsMembers(MaplePartyCharacter member) { + public boolean containsMembers(PartyCharacter member) { lock.lock(); try { return members.contains(member); @@ -68,7 +68,7 @@ public class Party { } } - public void addMember(MaplePartyCharacter member) { + public void addMember(PartyCharacter member) { lock.lock(); try { histMembers.put(member.getId(), nextEntry); @@ -80,7 +80,7 @@ public class Party { } } - public void removeMember(MaplePartyCharacter member) { + public void removeMember(PartyCharacter member) { lock.lock(); try { histMembers.remove(member.getId()); @@ -91,11 +91,11 @@ public class Party { } } - public void setLeader(MaplePartyCharacter victim) { + public void setLeader(PartyCharacter victim) { this.leaderId = victim.getId(); } - public void updateMember(MaplePartyCharacter member) { + public void updateMember(PartyCharacter member) { lock.lock(); try { for (int i = 0; i < members.size(); i++) { @@ -108,10 +108,10 @@ public class Party { } } - public MaplePartyCharacter getMemberById(int id) { + public PartyCharacter getMemberById(int id) { lock.lock(); try { - for (MaplePartyCharacter chr : members) { + for (PartyCharacter chr : members) { if (chr.getId() == id) { return chr; } @@ -122,7 +122,7 @@ public class Party { } } - public Collection getMembers() { + public Collection getMembers() { lock.lock(); try { return new LinkedList<>(members); @@ -131,7 +131,7 @@ public class Party { } } - public List getPartyMembers() { + public List getPartyMembers() { lock.lock(); try { return new LinkedList<>(members); @@ -140,12 +140,12 @@ public class Party { } } - public List getPartyMembersOnline() { + public List getPartyMembersOnline() { lock.lock(); try { - List ret = new LinkedList<>(); + List ret = new LinkedList<>(); - for (MaplePartyCharacter mpc : members) { + for (PartyCharacter mpc : members) { if (mpc.isOnline()) { ret.add(mpc); } @@ -158,11 +158,11 @@ public class Party { } // used whenever entering PQs: will draw every party member that can attempt a target PQ while ingnoring those unfit. - public Collection getEligibleMembers() { + public Collection getEligibleMembers() { return Collections.unmodifiableList(pqMembers); } - public void setEligibleMembers(List eliParty) { + public void setEligibleMembers(List eliParty) { pqMembers = eliParty; } @@ -178,10 +178,10 @@ public class Party { return leaderId; } - public MaplePartyCharacter getLeader() { + public PartyCharacter getLeader() { lock.lock(); try { - for (MaplePartyCharacter mpc : members) { + for (PartyCharacter mpc : members) { if (mpc.getId() == leaderId) { return mpc; } @@ -263,11 +263,11 @@ public class Party { public void assignNewLeader(Client c) { World world = c.getWorldServer(); - MaplePartyCharacter newLeadr = null; + PartyCharacter newLeadr = null; lock.lock(); try { - for (MaplePartyCharacter mpc : members) { + for (PartyCharacter mpc : members) { if (mpc.getId() != leaderId && (newLeadr == null || newLeadr.getLevel() < mpc.getLevel())) { newLeadr = mpc; } @@ -297,9 +297,9 @@ public class Party { return result; } - public MaplePartyCharacter getMemberByPos(int pos) { + public PartyCharacter getMemberByPos(int pos) { int i = 0; - for (MaplePartyCharacter chr : members) { + for (PartyCharacter chr : members) { if (pos == i) { return chr; } @@ -334,7 +334,7 @@ public class Party { return false; } - MaplePartyCharacter partyplayer = new MaplePartyCharacter(player); + PartyCharacter partyplayer = new PartyCharacter(player); party = player.getWorldServer().createParty(partyplayer); player.setParty(party); player.setMPC(partyplayer); @@ -364,7 +364,7 @@ public class Party { party = world.getParty(partyid); if (party != null) { if (party.getMembers().size() < 6) { - MaplePartyCharacter partyplayer = new MaplePartyCharacter(player); + PartyCharacter partyplayer = new PartyCharacter(player); player.getMap().addPartyMember(player, party.getId()); world.updateParty(party.getId(), PartyOperation.JOIN, partyplayer); @@ -395,7 +395,7 @@ public class Party { public static void leaveParty(Party party, Client c) { World world = c.getWorldServer(); Character player = c.getPlayer(); - MaplePartyCharacter partyplayer = player.getMPC(); + PartyCharacter partyplayer = player.getMPC(); if (party != null && partyplayer != null) { if (partyplayer.getId() == party.getLeaderId()) { @@ -443,11 +443,11 @@ public class Party { public static void expelFromParty(Party party, Client c, int expelCid) { World world = c.getWorldServer(); Character player = c.getPlayer(); - MaplePartyCharacter partyplayer = player.getMPC(); + PartyCharacter partyplayer = player.getMPC(); if (party != null && partyplayer != null) { if (partyplayer.equals(party.getLeader())) { - MaplePartyCharacter expelled = party.getMemberById(expelCid); + PartyCharacter expelled = party.getMemberById(expelCid); if (expelled != null) { Character emc = expelled.getPlayer(); if (emc != null) { diff --git a/src/main/java/net/server/world/MaplePartyCharacter.java b/src/main/java/net/server/world/PartyCharacter.java similarity index 86% rename from src/main/java/net/server/world/MaplePartyCharacter.java rename to src/main/java/net/server/world/PartyCharacter.java index ce27483c04..1e310d147e 100644 --- a/src/main/java/net/server/world/MaplePartyCharacter.java +++ b/src/main/java/net/server/world/PartyCharacter.java @@ -24,8 +24,8 @@ package net.server.world; import client.Character; import client.Job; -public class MaplePartyCharacter { - private String name; +public class PartyCharacter { + private final String name; private int id; private int level; private int channel, world; @@ -34,10 +34,10 @@ public class MaplePartyCharacter { private boolean online; private Job job; private Character character; - - public MaplePartyCharacter(Character maplechar) { + + public PartyCharacter(Character maplechar) { this.character = maplechar; - this.name = maplechar.getName(); + this.name = maplechar.getName(); this.level = maplechar.getLevel(); this.channel = maplechar.getClient().getChannel(); this.world = maplechar.getWorld(); @@ -48,12 +48,12 @@ public class MaplePartyCharacter { this.job = maplechar.getJob(); } - public MaplePartyCharacter() { + public PartyCharacter() { this.name = ""; } - + public Character getPlayer() { - return character; + return character; } public Job getJob() { @@ -71,7 +71,7 @@ public class MaplePartyCharacter { public void setChannel(int channel) { this.channel = channel; } - + public boolean isLeader() { return getPlayer().isPartyLeader(); } @@ -106,11 +106,11 @@ public class MaplePartyCharacter { public int getJobId() { return jobid; } - + public int getGuildId() { return character.getGuildId(); } - + @Override public int hashCode() { final int prime = 31; @@ -130,19 +130,14 @@ public class MaplePartyCharacter { if (getClass() != obj.getClass()) { return false; } - final MaplePartyCharacter other = (MaplePartyCharacter) obj; + final PartyCharacter other = (PartyCharacter) obj; if (name == null) { - if (other.name != null) { - return false; - } - } else if (!name.equals(other.name)) { - return false; - } - return true; + return other.name == null; + } else return name.equals(other.name); } public int getWorld() { return world; } - + } diff --git a/src/main/java/net/server/world/World.java b/src/main/java/net/server/world/World.java index 75e7714008..9a5973e4fa 100644 --- a/src/main/java/net/server/world/World.java +++ b/src/main/java/net/server/world/World.java @@ -838,7 +838,7 @@ public class World { } } - public Party createParty(MaplePartyCharacter chrfor) { + public Party createParty(PartyCharacter chrfor) { int partyid = runningPartyId.getAndIncrement(); Party party = new Party(partyid, chrfor); @@ -872,7 +872,7 @@ public class World { } } - private void updateCharacterParty(Party party, PartyOperation operation, MaplePartyCharacter target, Collection partyMembers) { + private void updateCharacterParty(Party party, PartyOperation operation, PartyCharacter target, Collection partyMembers) { switch (operation) { case JOIN: registerCharacterParty(target.getId(), party.getId()); @@ -886,7 +886,7 @@ public class World { case DISBAND: partyLock.lock(); try { - for (MaplePartyCharacter partychar : partyMembers) { + for (PartyCharacter partychar : partyMembers) { unregisterCharacterPartyInternal(partychar.getId()); } } finally { @@ -899,11 +899,11 @@ public class World { } } - private void updateParty(Party party, PartyOperation operation, MaplePartyCharacter target) { - Collection partyMembers = party.getMembers(); + private void updateParty(Party party, PartyOperation operation, PartyCharacter target) { + Collection partyMembers = party.getMembers(); updateCharacterParty(party, operation, target, partyMembers); - for (MaplePartyCharacter partychar : partyMembers) { + for (PartyCharacter partychar : partyMembers) { Character chr = getPlayerStorage().getCharacterById(partychar.getId()); if (chr != null) { if (operation == PartyOperation.DISBAND) { @@ -930,7 +930,7 @@ public class World { } } - public void updateParty(int partyid, PartyOperation operation, MaplePartyCharacter target) { + public void updateParty(int partyid, PartyOperation operation, PartyCharacter target) { Party party = getParty(partyid); if (party == null) { throw new IllegalArgumentException("no party with the specified partyid exists"); @@ -982,7 +982,7 @@ public class World { Party party = getParty(partyid); if(party == null) return; - for(MaplePartyCharacter mpc : party.getMembers()) { + for(PartyCharacter mpc : party.getMembers()) { Character mc = mpc.getPlayer(); if(mc != null) { MapleMap map = mc.getMap(); @@ -1012,7 +1012,7 @@ public class World { } public void partyChat(Party party, String chattext, String namefrom) { - for (MaplePartyCharacter partychar : party.getMembers()) { + for (PartyCharacter partychar : party.getMembers()) { if (!(partychar.getName().equals(namefrom))) { Character chr = getPlayerStorage().getCharacterByName(partychar.getName()); if (chr != null) { diff --git a/src/main/java/scripting/AbstractPlayerInteraction.java b/src/main/java/scripting/AbstractPlayerInteraction.java index 44dea1d1dc..80e22d8a74 100644 --- a/src/main/java/scripting/AbstractPlayerInteraction.java +++ b/src/main/java/scripting/AbstractPlayerInteraction.java @@ -31,8 +31,8 @@ import constants.game.GameConstants; import constants.inventory.ItemConstants; import net.server.Server; import net.server.guild.Guild; -import net.server.world.MaplePartyCharacter; import net.server.world.Party; +import net.server.world.PartyCharacter; import scripting.event.EventInstanceManager; import scripting.event.EventManager; import scripting.npc.NPCScriptManager; @@ -771,7 +771,7 @@ public class AbstractPlayerInteraction { removeAll(id); return; } - for (MaplePartyCharacter mpc : getParty().getMembers()) { + for (PartyCharacter mpc : getParty().getMembers()) { if (mpc == null || !mpc.isOnline()) { continue; } @@ -808,7 +808,7 @@ public class AbstractPlayerInteraction { int size = party.getMembers().size(); if(instance) { - for(MaplePartyCharacter member: party.getMembers()) { + for(PartyCharacter member: party.getMembers()) { if(member == null || !member.isOnline()){ size--; } else { @@ -821,7 +821,7 @@ public class AbstractPlayerInteraction { } int bonus = size < 4 ? 100 : 70 + (size * 10); - for (MaplePartyCharacter member : party.getMembers()) { + for (PartyCharacter member : party.getMembers()) { if(member == null || !member.isOnline()){ continue; } diff --git a/src/main/java/scripting/event/EventInstanceManager.java b/src/main/java/scripting/event/EventInstanceManager.java index 7283b5f881..fe668f6bfb 100644 --- a/src/main/java/scripting/event/EventInstanceManager.java +++ b/src/main/java/scripting/event/EventInstanceManager.java @@ -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) { diff --git a/src/main/java/scripting/event/EventManager.java b/src/main/java/scripting/event/EventManager.java index 2f1f5f018a..13f14960de 100644 --- a/src/main/java/scripting/event/EventManager.java +++ b/src/main/java/scripting/event/EventManager.java @@ -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 getEligibleParty(Party party) { + public List getEligibleParty(Party party) { if (party == null) { return new ArrayList<>(); } try { Object o = iv.invokeFunction("getEligibleParty", party.getPartyMembersOnline()); - if (o instanceof MaplePartyCharacter[] partyChrs) { - final List eligibleParty = new ArrayList<>(Arrays.asList(partyChrs)); + if (o instanceof PartyCharacter[] partyChrs) { + final List eligibleParty = new ArrayList<>(Arrays.asList(partyChrs)); party.setEligibleMembers(eligibleParty); return eligibleParty; } diff --git a/src/main/java/scripting/npc/NPCConversationManager.java b/src/main/java/scripting/npc/NPCConversationManager.java index f32294a3d2..8d49ad99c6 100644 --- a/src/main/java/scripting/npc/NPCConversationManager.java +++ b/src/main/java/scripting/npc/NPCConversationManager.java @@ -36,8 +36,8 @@ import net.server.coordinator.matchchecker.MatchCheckerListenerFactory.MatchChec import net.server.guild.Alliance; import net.server.guild.Guild; import net.server.guild.GuildPackets; -import net.server.world.MaplePartyCharacter; import net.server.world.Party; +import net.server.world.PartyCharacter; import provider.MapleData; import provider.MapleDataProviderFactory; import provider.wz.WZFiles; @@ -80,7 +80,7 @@ public class NPCConversationManager extends AbstractPlayerInteraction { private String scriptName; private String getText; private boolean itemScript; - private List otherParty; + private List otherParty; private Map npcDefaultTalks = new HashMap<>(); @@ -98,7 +98,7 @@ public class NPCConversationManager extends AbstractPlayerInteraction { this(c, npc, -1, scriptName, false); } - public NPCConversationManager(Client c, int npc, List otherParty, boolean test) { + public NPCConversationManager(Client c, int npc, List otherParty, boolean test) { super(c); this.c = c; this.npc = npc; @@ -522,7 +522,7 @@ public class NPCConversationManager extends AbstractPlayerInteraction { } if (!party) { - partyz = new Party(-1, new MaplePartyCharacter(getPlayer())); + partyz = new Party(-1, new PartyCharacter(getPlayer())); } Pyramid py = new Pyramid(partyz, mod, map.getId()); getPlayer().setPartyQuest(py); @@ -674,7 +674,7 @@ public class NPCConversationManager extends AbstractPlayerInteraction { map = cs.getMapFactory().getMap(980000100 + 100 * field); mapExit = cs.getMapFactory().getMap(980000000); - for (MaplePartyCharacter mpc : c.getPlayer().getParty().getMembers()) { + for (PartyCharacter mpc : c.getPlayer().getParty().getMembers()) { final Character mc = mpc.getPlayer(); if (mc != null) { mc.setChallenged(false); @@ -696,7 +696,7 @@ public class NPCConversationManager extends AbstractPlayerInteraction { } public void cancelCPQLobby() { - for (MaplePartyCharacter mpc : c.getPlayer().getParty().getMembers()) { + for (PartyCharacter mpc : c.getPlayer().getParty().getMembers()) { Character mc = mpc.getPlayer(); if (mc != null) { mc.clearCpqTimer(); @@ -725,8 +725,8 @@ public class NPCConversationManager extends AbstractPlayerInteraction { cpqMaxLvl = 70; } - List partyMembers = party.getPartyMembers(); - for (MaplePartyCharacter pchr : partyMembers) { + List partyMembers = party.getPartyMembers(); + for (PartyCharacter pchr : partyMembers) { if (pchr.getLevel() >= cpqMinLvl && pchr.getLevel() <= cpqMaxLvl) { if (lobby.getCharacterById(pchr.getId()) == null) { return 1; // party member detected out of area @@ -763,7 +763,7 @@ public class NPCConversationManager extends AbstractPlayerInteraction { throw new RuntimeException("No opponent found!"); } - for (MaplePartyCharacter mpc : challenger.getParty().getMembers()) { + for (PartyCharacter mpc : challenger.getParty().getMembers()) { Character mc = mpc.getPlayer(); if (mc != null) { mc.changeMap(lobbyMap, lobbyMap.getPortal(0)); @@ -771,7 +771,7 @@ public class NPCConversationManager extends AbstractPlayerInteraction { tMan.schedule(() -> mapClock(10), 1500); } } - for (MaplePartyCharacter mpc : getPlayer().getParty().getMembers()) { + for (PartyCharacter mpc : getPlayer().getParty().getMembers()) { Character mc = mpc.getPlayer(); if (mc != null) { TimerManager tMan = TimerManager.getInstance(); @@ -783,13 +783,13 @@ public class NPCConversationManager extends AbstractPlayerInteraction { TimerManager tMan = TimerManager.getInstance(); tMan.schedule(() -> { try { - for (MaplePartyCharacter mpc : getPlayer().getParty().getMembers()) { + for (PartyCharacter mpc : getPlayer().getParty().getMembers()) { Character mc = mpc.getPlayer(); if (mc != null) { mc.setMonsterCarnival(null); } } - for (MaplePartyCharacter mpc : challenger.getParty().getMembers()) { + for (PartyCharacter mpc : challenger.getParty().getMembers()) { Character mc = mpc.getPlayer(); if (mc != null) { mc.setMonsterCarnival(null); @@ -823,7 +823,7 @@ public class NPCConversationManager extends AbstractPlayerInteraction { throw new RuntimeException("No opponent found!"); } - for (MaplePartyCharacter mpc : challenger.getParty().getMembers()) { + for (PartyCharacter mpc : challenger.getParty().getMembers()) { Character mc = mpc.getPlayer(); if (mc != null) { mc.changeMap(lobbyMap, lobbyMap.getPortal(0)); @@ -835,13 +835,13 @@ public class NPCConversationManager extends AbstractPlayerInteraction { TimerManager tMan = TimerManager.getInstance(); tMan.schedule(() -> { try { - for (MaplePartyCharacter mpc : getPlayer().getParty().getMembers()) { + for (PartyCharacter mpc : getPlayer().getParty().getMembers()) { Character mc = mpc.getPlayer(); if (mc != null) { mc.setMonsterCarnival(null); } } - for (MaplePartyCharacter mpc : challenger.getParty().getMembers()) { + for (PartyCharacter mpc : challenger.getParty().getMembers()) { Character mc = mpc.getPlayer(); if (mc != null) { mc.setMonsterCarnival(null); @@ -923,7 +923,7 @@ public class NPCConversationManager extends AbstractPlayerInteraction { mapExit = cs.getMapFactory().getMap(980030000); map = cs.getMapFactory().getMap(980031000 + 1000 * field); - for (MaplePartyCharacter mpc : c.getPlayer().getParty().getMembers()) { + for (PartyCharacter mpc : c.getPlayer().getParty().getMembers()) { final Character mc = mpc.getPlayer(); if (mc != null) { mc.setChallenged(false); diff --git a/src/main/java/scripting/npc/NPCScriptManager.java b/src/main/java/scripting/npc/NPCScriptManager.java index 64f4b42e3b..b9d91dfa8d 100644 --- a/src/main/java/scripting/npc/NPCScriptManager.java +++ b/src/main/java/scripting/npc/NPCScriptManager.java @@ -23,7 +23,7 @@ package scripting.npc; import client.Character; import client.Client; -import net.server.world.MaplePartyCharacter; +import net.server.world.PartyCharacter; import scripting.AbstractScriptManager; import server.MapleItemInformationProvider.ScriptedItem; import tools.FilePrinter; @@ -79,7 +79,7 @@ public class NPCScriptManager extends AbstractScriptManager { return start(c, scriptItem.getNpc(), -1, scriptItem.getScript(), chr, true, "im"); } - public void start(String filename, Client c, int npc, List chrs) { + public void start(String filename, Client c, int npc, List chrs) { try { final NPCConversationManager cm = new NPCConversationManager(c, npc, chrs, true); cm.dispose(); diff --git a/src/main/java/server/MapleStatEffect.java b/src/main/java/server/MapleStatEffect.java index b65cfc7e0d..71d20bd11c 100644 --- a/src/main/java/server/MapleStatEffect.java +++ b/src/main/java/server/MapleStatEffect.java @@ -34,8 +34,8 @@ import constants.inventory.ItemConstants; import constants.skills.*; import net.packet.Packet; import net.server.Server; -import net.server.world.MaplePartyCharacter; import net.server.world.Party; +import net.server.world.PartyCharacter; import provider.MapleData; import provider.MapleDataTool; import server.life.MapleMonster; @@ -1041,7 +1041,7 @@ public class MapleStatEffect { final Disease dis = skill.getDisease(); Party opposition = applyfrom.getParty().getEnemy(); if (skill.targetsAll) { - for (MaplePartyCharacter enemyChrs : opposition.getPartyMembers()) { + for (PartyCharacter enemyChrs : opposition.getPartyMembers()) { Character chrApp = enemyChrs.getPlayer(); if (chrApp != null && chrApp.getMap().isCPQMap()) { if (dis == null) { diff --git a/src/main/java/server/life/MapleMonster.java b/src/main/java/server/life/MapleMonster.java index 7f06d8cde7..821d2d74c4 100644 --- a/src/main/java/server/life/MapleMonster.java +++ b/src/main/java/server/life/MapleMonster.java @@ -39,8 +39,8 @@ import net.server.services.task.channel.MobClearSkillService; import net.server.services.task.channel.MobStatusService; import net.server.services.task.channel.OverallService; import net.server.services.type.ChannelServices; -import net.server.world.MaplePartyCharacter; import net.server.world.Party; +import net.server.world.PartyCharacter; import scripting.event.EventInstanceManager; import server.MapleStatEffect; import server.TimerManager; @@ -370,7 +370,7 @@ public class MapleMonster extends AbstractLoadedMapleLife { int remainingHP = (int) Math.max(1, hp.get() * 100f / getMaxHp()); Packet packet = PacketCreator.showMonsterHP(getObjectId(), remainingHP); if (from.getParty() != null) { - for (MaplePartyCharacter mpc : from.getParty().getMembers()) { + for (PartyCharacter mpc : from.getParty().getMembers()) { Character member = from.getMap().getCharacterById(mpc.getId()); // god bless if (member != null) { member.sendPacket(packet); diff --git a/src/main/java/server/partyquest/MonsterCarnival.java b/src/main/java/server/partyquest/MonsterCarnival.java index 1715ec8281..f677b286c3 100644 --- a/src/main/java/server/partyquest/MonsterCarnival.java +++ b/src/main/java/server/partyquest/MonsterCarnival.java @@ -5,8 +5,8 @@ import config.YamlConfig; import constants.string.LanguageConstants; import net.server.Server; import net.server.channel.Channel; -import net.server.world.MaplePartyCharacter; import net.server.world.Party; +import net.server.world.PartyCharacter; import server.TimerManager; import server.maps.MapleMap; import server.maps.MapleReactor; @@ -50,7 +50,7 @@ public class MonsterCarnival { redPortal = 2; bluePortal = 1; } - for (MaplePartyCharacter mpc : p1.getMembers()) { + for (PartyCharacter mpc : p1.getMembers()) { Character mc = mpc.getPlayer(); if (mc != null) { mc.setMonsterCarnival(this); @@ -64,7 +64,7 @@ public class MonsterCarnival { team1 = mc; } } - for (MaplePartyCharacter mpc : p2.getMembers()) { + for (PartyCharacter mpc : p2.getMembers()) { Character mc = mpc.getPlayer(); if (mc != null) { mc.setMonsterCarnival(this); @@ -79,13 +79,13 @@ public class MonsterCarnival { } } if (team1 == null || team2 == null) { - for (MaplePartyCharacter mpc : p1.getMembers()) { + for (PartyCharacter mpc : p1.getMembers()) { Character chr = mpc.getPlayer(); if (chr != null) { chr.dropMessage(5, LanguageConstants.getMessage(chr, LanguageConstants.CPQError)); } } - for (MaplePartyCharacter mpc : p2.getMembers()) { + for (PartyCharacter mpc : p2.getMembers()) { Character chr = mpc.getPlayer(); if (chr != null) { chr.dropMessage(5, LanguageConstants.getMessage(chr, LanguageConstants.CPQError)); @@ -112,12 +112,12 @@ public class MonsterCarnival { public void playerDisconnected(int charid) { int team = -1; - for (MaplePartyCharacter mpc : leader1.getParty().getMembers()) { + for (PartyCharacter mpc : leader1.getParty().getMembers()) { if (mpc.getId() == charid) { team = 0; } } - for (MaplePartyCharacter mpc : leader2.getParty().getMembers()) { + for (PartyCharacter mpc : leader2.getParty().getMembers()) { if (mpc.getId() == charid) { team = 1; } @@ -198,7 +198,7 @@ public class MonsterCarnival { } else { out = cs.getMapFactory().getMap(980000010); } - for (MaplePartyCharacter mpc : leader1.getParty().getMembers()) { + for (PartyCharacter mpc : leader1.getParty().getMembers()) { Character mc = mpc.getPlayer(); if (mc != null) { mc.resetCP(); @@ -209,7 +209,7 @@ public class MonsterCarnival { } } } - for (MaplePartyCharacter mpc : leader2.getParty().getMembers()) { + for (PartyCharacter mpc : leader2.getParty().getMembers()) { Character mc = mpc.getPlayer(); if (mc != null) { mc.resetCP(); @@ -254,7 +254,7 @@ public class MonsterCarnival { try { Channel cs = map.getChannelServer(); if (winningTeam == 0) { - for (MaplePartyCharacter mpc : leader1.getParty().getMembers()) { + for (PartyCharacter mpc : leader1.getParty().getMembers()) { Character mc = mpc.getPlayer(); if (mc != null) { mc.gainFestivalPoints(this.redTotalCP); @@ -268,7 +268,7 @@ public class MonsterCarnival { mc.dispelDebuffs(); } } - for (MaplePartyCharacter mpc : leader2.getParty().getMembers()) { + for (PartyCharacter mpc : leader2.getParty().getMembers()) { Character mc = mpc.getPlayer(); if (mc != null) { mc.gainFestivalPoints(this.blueTotalCP); @@ -283,7 +283,7 @@ public class MonsterCarnival { } } } else if (winningTeam == 1) { - for (MaplePartyCharacter mpc : leader2.getParty().getMembers()) { + for (PartyCharacter mpc : leader2.getParty().getMembers()) { Character mc = mpc.getPlayer(); if (mc != null) { mc.gainFestivalPoints(this.blueTotalCP); @@ -297,7 +297,7 @@ public class MonsterCarnival { mc.dispelDebuffs(); } } - for (MaplePartyCharacter mpc : leader1.getParty().getMembers()) { + for (PartyCharacter mpc : leader1.getParty().getMembers()) { Character mc = mpc.getPlayer(); if (mc != null) { mc.gainFestivalPoints(this.redTotalCP); @@ -370,7 +370,7 @@ public class MonsterCarnival { } map.killAllMonsters(); - for (MaplePartyCharacter mpc : leader1.getParty().getMembers()) { + for (PartyCharacter mpc : leader1.getParty().getMembers()) { Character mc = mpc.getPlayer(); if (mc != null) { if (redWin) { @@ -384,7 +384,7 @@ public class MonsterCarnival { } } } - for (MaplePartyCharacter mpc : leader2.getParty().getMembers()) { + for (PartyCharacter mpc : leader2.getParty().getMembers()) { Character mc = mpc.getPlayer(); if (mc != null) { if (!redWin) { diff --git a/src/main/java/server/partyquest/PartyQuest.java b/src/main/java/server/partyquest/PartyQuest.java index 900923cafe..2851e080a1 100644 --- a/src/main/java/server/partyquest/PartyQuest.java +++ b/src/main/java/server/partyquest/PartyQuest.java @@ -24,8 +24,8 @@ package server.partyquest; import client.Character; import net.server.Server; -import net.server.world.MaplePartyCharacter; import net.server.world.Party; +import net.server.world.PartyCharacter; import tools.FilePrinter; import java.util.ArrayList; @@ -42,11 +42,11 @@ public class PartyQuest { public PartyQuest(Party party) { this.party = party; - MaplePartyCharacter leader = party.getLeader(); + PartyCharacter leader = party.getLeader(); channel = leader.getChannel(); world = leader.getWorld(); int mapid = leader.getMapId(); - for (MaplePartyCharacter pchr : party.getMembers()) { + for (PartyCharacter pchr : party.getMembers()) { if (pchr.getChannel() == channel && pchr.getMapId() == mapid) { Character chr = Server.getInstance().getWorld(world).getChannel(channel).getPlayerStorage().getCharacterById(pchr.getId()); if (chr != null) diff --git a/src/main/java/tools/PacketCreator.java b/src/main/java/tools/PacketCreator.java index 2651ebf67a..8b26ae71ce 100644 --- a/src/main/java/tools/PacketCreator.java +++ b/src/main/java/tools/PacketCreator.java @@ -52,8 +52,8 @@ import net.server.channel.handlers.WhisperHandler; import net.server.guild.Alliance; import net.server.guild.Guild; import net.server.guild.GuildSummary; -import net.server.world.MaplePartyCharacter; import net.server.world.Party; +import net.server.world.PartyCharacter; import net.server.world.PartyOperation; import net.server.world.World; import server.CashShop.CashItem; @@ -3765,23 +3765,23 @@ public class PacketCreator { } private static void addPartyStatus(int forchannel, Party party, OutPacket p, boolean leaving) { - List partymembers = new ArrayList<>(party.getMembers()); + List partymembers = new ArrayList<>(party.getMembers()); while (partymembers.size() < 6) { - partymembers.add(new MaplePartyCharacter()); + partymembers.add(new PartyCharacter()); } - for (MaplePartyCharacter partychar : partymembers) { + for (PartyCharacter partychar : partymembers) { p.writeInt(partychar.getId()); } - for (MaplePartyCharacter partychar : partymembers) { + for (PartyCharacter partychar : partymembers) { p.writeFixedString(getRightPaddedStr(partychar.getName(), '\0', 13)); } - for (MaplePartyCharacter partychar : partymembers) { + for (PartyCharacter partychar : partymembers) { p.writeInt(partychar.getJobId()); } - for (MaplePartyCharacter partychar : partymembers) { + for (PartyCharacter partychar : partymembers) { p.writeInt(partychar.getLevel()); } - for (MaplePartyCharacter partychar : partymembers) { + for (PartyCharacter partychar : partymembers) { if (partychar.isOnline()) { p.writeInt(partychar.getChannel() - 1); } else { @@ -3789,7 +3789,7 @@ public class PacketCreator { } } p.writeInt(party.getLeader().getId()); - for (MaplePartyCharacter partychar : partymembers) { + for (PartyCharacter partychar : partymembers) { if (partychar.getChannel() == forchannel) { p.writeInt(partychar.getMapId()); } else { @@ -3798,7 +3798,7 @@ public class PacketCreator { } Map partyDoors = party.getDoors(); - for (MaplePartyCharacter partychar : partymembers) { + for (PartyCharacter partychar : partymembers) { if (partychar.getChannel() == forchannel && !leaving) { if (partyDoors.size() > 0) { MapleDoor door = partyDoors.get(partychar.getId()); @@ -3829,7 +3829,7 @@ public class PacketCreator { } } - public static Packet updateParty(int forChannel, Party party, PartyOperation op, MaplePartyCharacter target) { + public static Packet updateParty(int forChannel, Party party, PartyOperation op, PartyCharacter target) { final OutPacket p = OutPacket.create(SendOpcode.PARTY_OPERATION); switch (op) { case DISBAND: