diff --git a/src/main/java/client/Character.java b/src/main/java/client/Character.java index e527f7f352..3804ce988b 100644 --- a/src/main/java/client/Character.java +++ b/src/main/java/client/Character.java @@ -161,7 +161,7 @@ public class Character extends AbstractCharacterObject { private MapleMiniGame miniGame; private MapleRockPaperScissor rps; private Mount maplemount; - private MapleParty party; + private Party party; private final Pet[] pets = new Pet[3]; private MaplePlayerShop playerShop = null; private MapleShop shop = null; @@ -1477,7 +1477,7 @@ public class Character extends AbstractCharacterObject { return lastVisited; } - public void partyOperationUpdate(MapleParty party, List exPartyMembers) { + public void partyOperationUpdate(Party party, List exPartyMembers) { List> mapids; petLock.lock(); @@ -1529,11 +1529,11 @@ public class Character extends AbstractCharacterObject { } } - private static void removePartyPlayerDoor(MapleParty party, Character target) { + private static void removePartyPlayerDoor(Party party, Character target) { target.removePartyDoor(party); } - private static void updatePartyTownDoors(MapleParty party, Character target, Character partyLeaver, List partyMembers) { + private static void updatePartyTownDoors(Party party, Character target, Character partyLeaver, List partyMembers) { if (partyLeaver != null) { removePartyPlayerDoor(party, target); } else { @@ -1679,11 +1679,11 @@ public class Character extends AbstractCharacterObject { MapleTrade.cancelTrade(this, MapleTrade.TradeResult.UNSUCCESSFUL_ANOTHER_MAP); this.closePlayerInteractions(); - MapleParty e = null; + Party e = null; if (this.getParty() != null && this.getParty().getEnemy() != null) { e = this.getParty().getEnemy(); } - final MapleParty k = e; + final Party k = e; sendPacket(warpPacket); map.removePlayer(this); @@ -4701,7 +4701,7 @@ public class Character extends AbstractCharacterObject { } public void applyPartyDoor(MapleDoor door, boolean partyUpdate) { - MapleParty chrParty; + Party chrParty; prtLock.lock(); try { if (!partyUpdate) { @@ -4721,7 +4721,7 @@ public class Character extends AbstractCharacterObject { public MapleDoor removePartyDoor(boolean partyUpdate) { MapleDoor ret = null; - MapleParty chrParty; + Party chrParty; prtLock.lock(); try { @@ -4742,7 +4742,7 @@ public class Character extends AbstractCharacterObject { return ret; } - private void removePartyDoor(MapleParty formerParty) { // player is no longer registered at this party + private void removePartyDoor(Party formerParty) { // player is no longer registered at this party formerParty.removeDoor(id); } @@ -5413,7 +5413,7 @@ public class Character extends AbstractCharacterObject { } } - public MapleParty getParty() { + public Party getParty() { prtLock.lock(); try { return party; @@ -6191,7 +6191,7 @@ public class Character extends AbstractCharacterObject { public boolean isPartyLeader() { prtLock.lock(); try { - MapleParty party = getParty(); + Party party = getParty(); return party != null && party.getLeaderId() == getId(); } finally { prtLock.unlock(); @@ -6509,7 +6509,7 @@ public class Character extends AbstractCharacterObject { } public boolean leaveParty() { - MapleParty party; + Party party; boolean partyLeader; prtLock.lock(); @@ -6524,7 +6524,7 @@ public class Character extends AbstractCharacterObject { if (partyLeader) { party.assignNewLeader(client); } - MapleParty.leaveParty(party, client); + Party.leaveParty(party, client); return true; } else { @@ -7127,7 +7127,7 @@ public class Character extends AbstractCharacterObject { } ret.setPosition(portal.getPosition()); int partyid = rs.getInt("party"); - MapleParty party = wserv.getParty(partyid); + Party party = wserv.getParty(partyid); if (party != null) { ret.mpc = party.getMemberById(ret.id); if (ret.mpc != null) { @@ -9261,7 +9261,7 @@ public class Character extends AbstractCharacterObject { } } - public void setParty(MapleParty p) { + public void setParty(Party p) { prtLock.lock(); try { if (p == null) { @@ -9677,7 +9677,7 @@ public class Character extends AbstractCharacterObject { silentPartyUpdateInternal(getParty()); } - private void silentPartyUpdateInternal(MapleParty chrParty) { + private void silentPartyUpdateInternal(Party chrParty) { if (chrParty != null) { getWorldServer().updateParty(chrParty.getId(), PartyOperation.SILENT_UPDATE, getMPC()); } diff --git a/src/main/java/client/Client.java b/src/main/java/client/Client.java index f6796fb8da..04af360fbc 100644 --- a/src/main/java/client/Client.java +++ b/src/main/java/client/Client.java @@ -878,7 +878,7 @@ public class Client extends ChannelInboundHandlerAdapter { private void removePartyPlayer(World wserv) { MapleMap map = player.getMap(); - final MapleParty party = player.getParty(); + final Party party = player.getParty(); final int idz = player.getId(); if (party != null) { @@ -1097,7 +1097,7 @@ public class Client extends ChannelInboundHandlerAdapter { if (partyid != null) { this.setPlayer(chr); - MapleParty party = chr.getWorldServer().getParty(partyid); + Party party = chr.getWorldServer().getParty(partyid); chr.setParty(party); chr.getMPC(); chr.leaveParty(); // thanks Vcoc for pointing out deleted characters would still stay in a party diff --git a/src/main/java/net/server/channel/Channel.java b/src/main/java/net/server/channel/Channel.java index 386e8427fd..84b7a0edea 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.MapleParty; import net.server.world.MaplePartyCharacter; +import net.server.world.Party; import net.server.world.World; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -317,7 +317,7 @@ public final class Channel { } } - public List getPartyMembers(MapleParty party) { + public List getPartyMembers(Party party) { List partym = new ArrayList<>(8); for (MaplePartyCharacter partychar : party.getMembers()) { if (partychar.getChannel() == getId()) { @@ -465,7 +465,7 @@ public final class Channel { this.storedVars.put(key, val); } - public int lookupPartyDojo(MapleParty party) { + public int lookupPartyDojo(Party party) { if(party == null) return -1; Integer i = dojoParty.get(party.hashCode()); @@ -476,7 +476,7 @@ public final class Channel { return ingressDojo(isPartyDojo, null, fromStage); } - public int ingressDojo(boolean isPartyDojo, MapleParty party, int fromStage) { + public int ingressDojo(boolean isPartyDojo, Party party, int fromStage) { lock.lock(); try { int dojoList = this.usedDojo; @@ -516,7 +516,7 @@ public final class Channel { } } - private void freeDojoSlot(int slot, MapleParty party) { + private void freeDojoSlot(int slot, Party party) { int mask = 0b11111111111111111111; mask ^= (1 << slot); @@ -594,7 +594,7 @@ public final class Channel { this.dojoTask[slot] = TimerManager.getInstance().schedule(() -> { final int delta = (dojoMapId) % 100; final int dojoBaseMap = (slot < 5) ? 925030000 : 925020000; - MapleParty party = null; + Party party = null; for (int i = 0; i < 5; i++) { //only 32 stages, but 38 maps if (stage + i > 38) { @@ -619,7 +619,7 @@ public final class Channel { dojoFinishTime[slot] = Server.getInstance().getCurrentTime() + clockTime; } - public void dismissDojoSchedule(int dojoMapId, MapleParty party) { + public void dismissDojoSchedule(int dojoMapId, Party party) { int slot = getDojoSlot(dojoMapId); int stage = (dojoMapId / 100) % 100; if(stage <= dojoStage[slot]) return; diff --git a/src/main/java/net/server/channel/handlers/GuildOperationHandler.java b/src/main/java/net/server/channel/handlers/GuildOperationHandler.java index 33c275ea5c..49ca2ae0bc 100644 --- a/src/main/java/net/server/channel/handlers/GuildOperationHandler.java +++ b/src/main/java/net/server/channel/handlers/GuildOperationHandler.java @@ -33,7 +33,7 @@ import net.server.guild.Alliance; import net.server.guild.Guild; import net.server.guild.GuildPackets; import net.server.guild.GuildResponse; -import net.server.world.MapleParty; +import net.server.world.Party; import net.server.world.World; import tools.PacketCreator; @@ -90,7 +90,7 @@ public final class GuildOperationHandler extends AbstractPacketHandler { return; } - if (!MapleParty.createParty(mc, true)) { + if (!Party.createParty(mc, true)) { mc.dropMessage(1, "You cannot create a new Guild while in a party."); return; } @@ -260,7 +260,7 @@ public final class GuildOperationHandler extends AbstractPacketHandler { if (leader != null) { int partyid = leader.getPartyId(); if (partyid != -1) { - MapleParty.joinParty(mc, partyid, true); // GMS gimmick "party to form guild" recalled thanks to Vcoc + Party.joinParty(mc, partyid, true); // GMS gimmick "party to form guild" recalled thanks to Vcoc } } } diff --git a/src/main/java/net/server/channel/handlers/MonsterCarnivalHandler.java b/src/main/java/net/server/channel/handlers/MonsterCarnivalHandler.java index 674d433c10..f9eb15b558 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.MapleParty; import net.server.world.MaplePartyCharacter; +import net.server.world.Party; import server.life.MapleLifeFactory; import server.life.MapleMonster; import server.partyquest.MapleCarnivalFactory; @@ -100,7 +100,7 @@ public final class MonsterCarnivalHandler extends AbstractPacketHandler { return; } final Disease dis = skill.getDisease(); - MapleParty enemies = c.getPlayer().getParty().getEnemy(); + Party enemies = c.getPlayer().getParty().getEnemy(); if (skill.targetsAll) { int hitChance = 0; if (dis.getDisease() == 121 || dis.getDisease() == 122 || dis.getDisease() == 125 || dis.getDisease() == 126) { diff --git a/src/main/java/net/server/channel/handlers/PartyOperationHandler.java b/src/main/java/net/server/channel/handlers/PartyOperationHandler.java index 2d7d4db7ea..123df4889f 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.MapleParty; import net.server.world.MaplePartyCharacter; +import net.server.world.Party; import net.server.world.PartyOperation; import net.server.world.World; import tools.PacketCreator; @@ -45,17 +45,17 @@ public final class PartyOperationHandler extends AbstractPacketHandler { int operation = p.readByte(); Character player = c.getPlayer(); World world = c.getWorldServer(); - MapleParty party = player.getParty(); + Party party = player.getParty(); switch (operation) { case 1: { // create - MapleParty.createParty(player, false); + Party.createParty(player, false); break; } case 2: { // leave/disband if (party != null) { List partymembers = player.getPartyMembersOnline(); - MapleParty.leaveParty(party, c); + Party.leaveParty(party, c); player.updatePartySearchAvailability(true); player.partyOperationUpdate(party, partymembers); } @@ -67,7 +67,7 @@ public final class PartyOperationHandler extends AbstractPacketHandler { MapleInviteResult inviteRes = InviteCoordinator.answerInvite(InviteType.PARTY, player.getId(), partyid, true); InviteResult res = inviteRes.result; if (res == InviteResult.ACCEPTED) { - MapleParty.joinParty(player, partyid, false); + Party.joinParty(player, partyid, false); } else { c.sendPacket(PacketCreator.serverNotice(5, "You couldn't join the party due to an expired invitation request.")); } @@ -88,7 +88,7 @@ public final class PartyOperationHandler extends AbstractPacketHandler { if (invited.getParty() == null) { if (party == null) { - if (!MapleParty.createParty(player, false)) { + if (!Party.createParty(player, false)) { return; } @@ -113,7 +113,7 @@ public final class PartyOperationHandler extends AbstractPacketHandler { } case 5: { // expel int cid = p.readInt(); - MapleParty.expelFromParty(party, c, cid); + Party.expelFromParty(party, c, cid); break; } case 6: { // change leader diff --git a/src/main/java/net/server/channel/handlers/PartySearchStartHandler.java b/src/main/java/net/server/channel/handlers/PartySearchStartHandler.java index 3322301d2b..0f9b8a8804 100644 --- a/src/main/java/net/server/channel/handlers/PartySearchStartHandler.java +++ b/src/main/java/net/server/channel/handlers/PartySearchStartHandler.java @@ -25,7 +25,7 @@ import client.Character; import client.Client; import net.AbstractPacketHandler; import net.packet.InPacket; -import net.server.world.MapleParty; +import net.server.world.Party; import net.server.world.World; import tools.PacketCreator; @@ -63,7 +63,7 @@ public class PartySearchStartHandler extends AbstractPacketHandler { p.readInt(); // members int jobs = p.readInt(); - MapleParty party = c.getPlayer().getParty(); + Party party = c.getPlayer().getParty(); if (party == null || !c.getPlayer().isPartyLeader()) return; World world = c.getWorldServer(); diff --git a/src/main/java/net/server/coordinator/matchchecker/listener/MatchCheckerGuildCreation.java b/src/main/java/net/server/coordinator/matchchecker/listener/MatchCheckerGuildCreation.java index a3745f2484..c0ccf29672 100644 --- a/src/main/java/net/server/coordinator/matchchecker/listener/MatchCheckerGuildCreation.java +++ b/src/main/java/net/server/coordinator/matchchecker/listener/MatchCheckerGuildCreation.java @@ -29,7 +29,7 @@ import net.server.coordinator.matchchecker.MatchCheckerListenerRecipe; import net.server.guild.Guild; import net.server.guild.GuildCharacter; import net.server.guild.GuildPackets; -import net.server.world.MapleParty; +import net.server.world.Party; import java.util.Set; @@ -157,7 +157,7 @@ public class MatchCheckerGuildCreation implements MatchCheckerListenerRecipe { public void onMatchDeclined(int leaderid, Set matchPlayers, String message) { for (Character chr : matchPlayers) { if (chr.getId() == leaderid && chr.getClient() != null) { - MapleParty.leaveParty(chr.getParty(), chr.getClient()); + Party.leaveParty(chr.getParty(), chr.getClient()); } if (chr.isLoggedinWorld()) { @@ -186,7 +186,7 @@ public class MatchCheckerGuildCreation implements MatchCheckerListenerRecipe { for (Character chr : matchPlayers) { if (chr.getId() == leaderid && chr.getClient() != null) { - MapleParty.leaveParty(chr.getParty(), chr.getClient()); + Party.leaveParty(chr.getParty(), chr.getClient()); } if (chr.isLoggedinWorld()) { diff --git a/src/main/java/net/server/coordinator/partysearch/PartySearchCoordinator.java b/src/main/java/net/server/coordinator/partysearch/PartySearchCoordinator.java index 053c7587a4..c5e9fad49d 100644 --- a/src/main/java/net/server/coordinator/partysearch/PartySearchCoordinator.java +++ b/src/main/java/net/server/coordinator/partysearch/PartySearchCoordinator.java @@ -30,7 +30,7 @@ import net.server.audit.locks.factory.MonitoredReadLockFactory; import net.server.audit.locks.factory.MonitoredWriteLockFactory; import net.server.coordinator.world.InviteCoordinator; import net.server.coordinator.world.InviteCoordinator.InviteType; -import net.server.world.MapleParty; +import net.server.world.Party; import provider.MapleData; import provider.MapleDataProviderFactory; import provider.MapleDataTool; @@ -392,7 +392,7 @@ public class PartySearchCoordinator { } for (Character leader : searchedLeaders) { - MapleParty party = leader.getParty(); + Party party = leader.getParty(); if (party != null && party.getMembers().size() < 6) { addQueueLeader(leader); } else { diff --git a/src/main/java/net/server/guild/Alliance.java b/src/main/java/net/server/guild/Alliance.java index c24e3f6a6f..9831a294cb 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.MapleParty; import net.server.world.MaplePartyCharacter; +import net.server.world.Party; import tools.DatabaseConnection; import java.sql.Connection; @@ -83,7 +83,7 @@ public class Alliance { } } - private static List getPartyGuildMasters(MapleParty party) { + private static List getPartyGuildMasters(Party party) { List mcl = new LinkedList<>(); for (MaplePartyCharacter mpc : party.getMembers()) { @@ -109,7 +109,7 @@ public class Alliance { return mcl; } - public static Alliance createAlliance(MapleParty party, String name) { + public static Alliance createAlliance(Party party, String name) { List guildMasters = getPartyGuildMasters(party); if (guildMasters.size() != 2) { return null; diff --git a/src/main/java/net/server/world/MapleParty.java b/src/main/java/net/server/world/Party.java similarity index 90% rename from src/main/java/net/server/world/MapleParty.java rename to src/main/java/net/server/world/Party.java index 7929cbfb14..0137fbeb54 100644 --- a/src/main/java/net/server/world/MapleParty.java +++ b/src/main/java/net/server/world/Party.java @@ -39,22 +39,22 @@ import tools.PacketCreator; import java.util.*; import java.util.Map.Entry; -public class MapleParty { +public class Party { private int id; - private MapleParty enemy = null; + private Party enemy = null; private int leaderId; - private List members = new LinkedList<>(); + private final List members = new LinkedList<>(); private List pqMembers = null; - private Map histMembers = new HashMap<>(); + private final Map histMembers = new HashMap<>(); private int nextEntry = 0; - private Map doors = new HashMap<>(); + private final Map doors = new HashMap<>(); private MonitoredReentrantLock lock = MonitoredReentrantLockFactory.createLock(MonitoredLockType.PARTY, true); - public MapleParty(int id, MaplePartyCharacter chrfor) { + public Party(int id, MaplePartyCharacter chrfor) { this.leaderId = chrfor.getId(); this.id = id; } @@ -139,18 +139,18 @@ public class MapleParty { lock.unlock(); } } - + public List getPartyMembersOnline() { lock.lock(); try { List ret = new LinkedList<>(); - + for (MaplePartyCharacter mpc : members) { if (mpc.isOnline()) { ret.add(mpc); } } - + return ret; } finally { lock.unlock(); @@ -193,11 +193,11 @@ public class MapleParty { } } - public MapleParty getEnemy() { + public Party getEnemy() { return enemy; } - public void setEnemy(MapleParty enemy) { + public void setEnemy(Party enemy) { this.enemy = enemy; } @@ -319,15 +319,12 @@ public class MapleParty { if (getClass() != obj.getClass()) { return false; } - final MapleParty other = (MapleParty) obj; - if (id != other.id) { - return false; - } - return true; + final Party other = (Party) obj; + return id == other.id; } - + public static boolean createParty(Character player, boolean silentCheck) { - MapleParty party = player.getParty(); + Party party = player.getParty(); if (party == null) { if (player.getLevel() < 10 && !YamlConfig.config.server.USE_PARTY_FOR_STARTERS) { player.sendPacket(PacketCreator.partyStatusMessage(10)); @@ -336,44 +333,44 @@ public class MapleParty { player.dropMessage(5, "You cannot request a party creation while participating the Ariant Battle Arena."); return false; } - + MaplePartyCharacter partyplayer = new MaplePartyCharacter(player); party = player.getWorldServer().createParty(partyplayer); player.setParty(party); player.setMPC(partyplayer); player.getMap().addPartyMember(player, party.getId()); player.silentPartyUpdate(); - + player.updatePartySearchAvailability(false); player.partyOperationUpdate(party, null); - + player.sendPacket(PacketCreator.partyCreated(party, partyplayer.getId())); - + return true; } else { if (!silentCheck) { player.sendPacket(PacketCreator.partyStatusMessage(16)); } - + return false; } } - + public static boolean joinParty(Character player, int partyid, boolean silentCheck) { - MapleParty party = player.getParty(); + Party party = player.getParty(); World world = player.getWorldServer(); - + if (party == null) { party = world.getParty(partyid); if (party != null) { if (party.getMembers().size() < 6) { MaplePartyCharacter partyplayer = new MaplePartyCharacter(player); player.getMap().addPartyMember(player, party.getId()); - + world.updateParty(party.getId(), PartyOperation.JOIN, partyplayer); player.receivePartyMemberHP(); player.updatePartyMemberHP(); - + player.resetPartySearchInvite(party.getLeaderId()); player.updatePartySearchAvailability(false); player.partyOperationUpdate(party, null); @@ -391,28 +388,28 @@ public class MapleParty { player.sendPacket(PacketCreator.serverNotice(5, "You can't join the party as you are already in one.")); } } - + return false; } - - public static void leaveParty(MapleParty party, Client c) { + + public static void leaveParty(Party party, Client c) { World world = c.getWorldServer(); Character player = c.getPlayer(); MaplePartyCharacter partyplayer = player.getMPC(); - + if (party != null && partyplayer != null) { if (partyplayer.getId() == party.getLeaderId()) { c.getWorldServer().removeMapPartyMembers(party.getId()); - + MonsterCarnival mcpq = player.getMonsterCarnival(); if (mcpq != null) { mcpq.leftParty(player.getId()); } - + world.updateParty(party.getId(), PartyOperation.DISBAND, partyplayer); - + EventInstanceManager eim = player.getEventInstance(); - if(eim != null) { + if (eim != null) { eim.disbandParty(); } } else { @@ -420,58 +417,60 @@ public class MapleParty { if (map != null) { map.removePartyMember(player, party.getId()); } - + MonsterCarnival mcpq = player.getMonsterCarnival(); if (mcpq != null) { mcpq.leftParty(player.getId()); } world.updateParty(party.getId(), PartyOperation.LEAVE, partyplayer); - + EventInstanceManager eim = player.getEventInstance(); - if(eim != null) { + if (eim != null) { eim.leftParty(player); } } - + player.setParty(null); - + MatchCheckerCoordinator mmce = c.getWorldServer().getMatchCheckerCoordinator(); if (mmce.getMatchConfirmationLeaderid(player.getId()) == player.getId() && mmce.getMatchConfirmationType(player.getId()) == MatchCheckerType.GUILD_CREATION) { mmce.dismissMatchConfirmation(player.getId()); } } } - - public static void expelFromParty(MapleParty party, Client c, int expelCid) { + + public static void expelFromParty(Party party, Client c, int expelCid) { World world = c.getWorldServer(); Character player = c.getPlayer(); MaplePartyCharacter partyplayer = player.getMPC(); - + if (party != null && partyplayer != null) { if (partyplayer.equals(party.getLeader())) { MaplePartyCharacter expelled = party.getMemberById(expelCid); if (expelled != null) { Character emc = expelled.getPlayer(); - if(emc != null) { + if (emc != null) { List partyMembers = emc.getPartyMembersOnline(); MapleMap map = emc.getMap(); - if(map != null) map.removePartyMember(emc, party.getId()); - + if (map != null) { + map.removePartyMember(emc, party.getId()); + } + MonsterCarnival mcpq = player.getMonsterCarnival(); if (mcpq != null) { mcpq.leftParty(emc.getId()); } - + EventInstanceManager eim = emc.getEventInstance(); - if(eim != null) { + if (eim != null) { eim.leftParty(emc); } emc.setParty(null); world.updateParty(party.getId(), PartyOperation.EXPEL, expelled); - + emc.updatePartySearchAvailability(true); emc.partyOperationUpdate(party, partyMembers); } else { diff --git a/src/main/java/net/server/world/World.java b/src/main/java/net/server/world/World.java index 7e5dedd5b9..75e7714008 100644 --- a/src/main/java/net/server/world/World.java +++ b/src/main/java/net/server/world/World.java @@ -104,7 +104,7 @@ public class World { private Map> marriageGuests = new ConcurrentHashMap<>(); private Map partyChars = new HashMap<>(); - private Map parties = new HashMap<>(); + private Map parties = new HashMap<>(); private AtomicInteger runningPartyId = new AtomicInteger(); private MonitoredReentrantLock partyLock = MonitoredReentrantLockFactory.createLock(MonitoredLockType.WORLD_PARTY, true); @@ -838,9 +838,9 @@ public class World { } } - public MapleParty createParty(MaplePartyCharacter chrfor) { + public Party createParty(MaplePartyCharacter chrfor) { int partyid = runningPartyId.getAndIncrement(); - MapleParty party = new MapleParty(partyid, chrfor); + Party party = new Party(partyid, chrfor); partyLock.lock(); try { @@ -854,7 +854,7 @@ public class World { return party; } - public MapleParty getParty(int partyid) { + public Party getParty(int partyid) { partyLock.lock(); try { return parties.get(partyid); @@ -863,7 +863,7 @@ public class World { } } - private MapleParty disbandParty(int partyid) { + private Party disbandParty(int partyid) { partyLock.lock(); try { return parties.remove(partyid); @@ -872,7 +872,7 @@ public class World { } } - private void updateCharacterParty(MapleParty party, PartyOperation operation, MaplePartyCharacter target, Collection partyMembers) { + private void updateCharacterParty(Party party, PartyOperation operation, MaplePartyCharacter target, Collection partyMembers) { switch (operation) { case JOIN: registerCharacterParty(target.getId(), party.getId()); @@ -899,7 +899,7 @@ public class World { } } - private void updateParty(MapleParty party, PartyOperation operation, MaplePartyCharacter target) { + private void updateParty(Party party, PartyOperation operation, MaplePartyCharacter target) { Collection partyMembers = party.getMembers(); updateCharacterParty(party, operation, target, partyMembers); @@ -931,7 +931,7 @@ public class World { } public void updateParty(int partyid, PartyOperation operation, MaplePartyCharacter target) { - MapleParty party = getParty(partyid); + Party party = getParty(partyid); if (party == null) { throw new IllegalArgumentException("no party with the specified partyid exists"); } @@ -979,7 +979,7 @@ public class World { } public void removeMapPartyMembers(int partyid) { - MapleParty party = getParty(partyid); + Party party = getParty(partyid); if(party == null) return; for(MaplePartyCharacter mpc : party.getMembers()) { @@ -1011,7 +1011,7 @@ public class World { return channel; } - public void partyChat(MapleParty party, String chattext, String namefrom) { + public void partyChat(Party party, String chattext, String namefrom) { for (MaplePartyCharacter partychar : party.getMembers()) { if (!(partychar.getName().equals(namefrom))) { Character chr = getPlayerStorage().getCharacterByName(partychar.getName()); @@ -2006,7 +2006,7 @@ public class World { } private void clearWorldData() { - List pList; + List pList; partyLock.lock(); try { pList = new ArrayList<>(parties.values()); @@ -2014,7 +2014,7 @@ public class World { partyLock.unlock(); } - for(MapleParty p : pList) { + for(Party p : pList) { p.disposeLocks(); } diff --git a/src/main/java/scripting/AbstractPlayerInteraction.java b/src/main/java/scripting/AbstractPlayerInteraction.java index 7041f0441b..44dea1d1dc 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.MapleParty; import net.server.world.MaplePartyCharacter; +import net.server.world.Party; import scripting.event.EventInstanceManager; import scripting.event.EventManager; import scripting.npc.NPCScriptManager; @@ -723,7 +723,7 @@ public class AbstractPlayerInteraction { return null; } - public MapleParty getParty() { + public Party getParty() { return getPlayer().getParty(); } @@ -804,7 +804,7 @@ public class AbstractPlayerInteraction { //4 players = +10% bonus (110) //5 players = +20% bonus (120) //6 players = +30% bonus (130) - MapleParty party = getPlayer().getParty(); + Party party = getPlayer().getParty(); int size = party.getMembers().size(); if(instance) { diff --git a/src/main/java/scripting/event/EventInstanceManager.java b/src/main/java/scripting/event/EventInstanceManager.java index ab31014dde..7283b5f881 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.MapleParty; import net.server.world.MaplePartyCharacter; +import net.server.world.Party; import scripting.AbstractPlayerInteraction; import scripting.event.scheduler.EventScriptScheduler; import server.MapleItemInformationProvider; @@ -350,7 +350,7 @@ public class EventInstanceManager { } } - public void registerParty(MapleParty party, MapleMap map) { + public void registerParty(Party party, MapleMap map) { for (MaplePartyCharacter mpc : party.getEligibleMembers()) { if (mpc.isOnline()) { // thanks resinate Character chr = map.getCharacterById(mpc.getId()); diff --git a/src/main/java/scripting/event/EventManager.java b/src/main/java/scripting/event/EventManager.java index 8d68d1b515..2f1f5f018a 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.MapleParty; import net.server.world.MaplePartyCharacter; +import net.server.world.Party; import net.server.world.World; import scripting.event.scheduler.EventScriptScheduler; import server.MapleMarriage; @@ -507,15 +507,15 @@ public class EventManager { } //PQ method: starts a PQ - public boolean startInstance(MapleParty party, MapleMap map) { + public boolean startInstance(Party party, MapleMap map) { return startInstance(-1, party, map); } - public boolean startInstance(int lobbyId, MapleParty party, MapleMap map) { + public boolean startInstance(int lobbyId, Party party, MapleMap map) { return startInstance(lobbyId, party, map, party.getLeader().getPlayer()); } - public boolean startInstance(int lobbyId, MapleParty party, MapleMap map, Character leader) { + public boolean startInstance(int lobbyId, Party party, MapleMap map, Character leader) { if (this.isDisposed()) return false; try { @@ -574,15 +574,15 @@ public class EventManager { } //PQ method: starts a PQ with a difficulty level, requires function setup(difficulty, leaderid) instead of setup() - public boolean startInstance(MapleParty party, MapleMap map, int difficulty) { + public boolean startInstance(Party party, MapleMap map, int difficulty) { return startInstance(-1, party, map, difficulty); } - public boolean startInstance(int lobbyId, MapleParty party, MapleMap map, int difficulty) { + public boolean startInstance(int lobbyId, Party party, MapleMap map, int difficulty) { return startInstance(lobbyId, party, map, difficulty, party.getLeader().getPlayer()); } - public boolean startInstance(int lobbyId, MapleParty party, MapleMap map, int difficulty, Character leader) { + public boolean startInstance(int lobbyId, Party party, MapleMap map, int difficulty, Character leader) { if (this.isDisposed()) return false; try { @@ -702,7 +702,7 @@ public class EventManager { return false; } - public List getEligibleParty(MapleParty party) { + public List getEligibleParty(Party party) { if (party == null) { return new ArrayList<>(); } diff --git a/src/main/java/scripting/npc/NPCConversationManager.java b/src/main/java/scripting/npc/NPCConversationManager.java index b17bd4a4f8..f32294a3d2 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.MapleParty; import net.server.world.MaplePartyCharacter; +import net.server.world.Party; import provider.MapleData; import provider.MapleDataProviderFactory; import provider.wz.WZFiles; @@ -327,7 +327,7 @@ public class NPCConversationManager extends AbstractPlayerInteraction { } @Override - public MapleParty getParty() { + public Party getParty() { return getPlayer().getParty(); } @@ -498,7 +498,7 @@ public class NPCConversationManager extends AbstractPlayerInteraction { public boolean createPyramid(String mode, boolean party) {//lol PyramidMode mod = PyramidMode.valueOf(mode); - MapleParty partyz = getPlayer().getParty(); + Party partyz = getPlayer().getParty(); MapleMapManager mapManager = c.getChannelServer().getMapFactory(); MapleMap map = null; @@ -522,7 +522,7 @@ public class NPCConversationManager extends AbstractPlayerInteraction { } if (!party) { - partyz = new MapleParty(-1, new MaplePartyCharacter(getPlayer())); + partyz = new Party(-1, new MaplePartyCharacter(getPlayer())); } Pyramid py = new Pyramid(partyz, mod, map.getId()); getPlayer().setPartyQuest(py); @@ -714,7 +714,7 @@ public class NPCConversationManager extends AbstractPlayerInteraction { } } - private int isCPQParty(MapleMap lobby, MapleParty party) { + private int isCPQParty(MapleMap lobby, Party party) { int cpqMinLvl, cpqMaxLvl; if (lobby.isCPQLobby()) { @@ -739,7 +739,7 @@ public class NPCConversationManager extends AbstractPlayerInteraction { return 0; } - private int canStartCPQ(MapleMap lobby, MapleParty party, MapleParty challenger) { + private int canStartCPQ(MapleMap lobby, Party party, Party challenger) { int ret = isCPQParty(lobby, party); if (ret != 0) { return ret; @@ -800,7 +800,7 @@ public class NPCConversationManager extends AbstractPlayerInteraction { return; } - MapleParty lobbyParty = getPlayer().getParty(), challengerParty = challenger.getParty(); + Party lobbyParty = getPlayer().getParty(), challengerParty = challenger.getParty(); int status = canStartCPQ(lobbyMap, lobbyParty, challengerParty); if (status == 0) { new MonsterCarnival(lobbyParty, challengerParty, mapid, true, (field / 100) % 10); @@ -852,7 +852,7 @@ public class NPCConversationManager extends AbstractPlayerInteraction { return; } - MapleParty lobbyParty = getPlayer().getParty(), challengerParty = challenger.getParty(); + Party lobbyParty = getPlayer().getParty(), challengerParty = challenger.getParty(); int status = canStartCPQ(lobbyMap, lobbyParty, challengerParty); if (status == 0) { new MonsterCarnival(lobbyParty, challengerParty, mapid, false, (field / 1000) % 10); diff --git a/src/main/java/server/MapleStatEffect.java b/src/main/java/server/MapleStatEffect.java index cd82809ab8..b65cfc7e0d 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.MapleParty; import net.server.world.MaplePartyCharacter; +import net.server.world.Party; import provider.MapleData; import provider.MapleDataTool; import server.life.MapleMonster; @@ -1039,7 +1039,7 @@ public class MapleStatEffect { final MCSkill skill = MapleCarnivalFactory.getInstance().getSkill(nuffSkill); if (skill != null) { final Disease dis = skill.getDisease(); - MapleParty opposition = applyfrom.getParty().getEnemy(); + Party opposition = applyfrom.getParty().getEnemy(); if (skill.targetsAll) { for (MaplePartyCharacter enemyChrs : opposition.getPartyMembers()) { Character chrApp = enemyChrs.getPlayer(); diff --git a/src/main/java/server/life/MapleMonster.java b/src/main/java/server/life/MapleMonster.java index ef96976430..7f06d8cde7 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.MapleParty; import net.server.world.MaplePartyCharacter; +import net.server.world.Party; import scripting.event.EventInstanceManager; import server.MapleStatEffect; import server.TimerManager; @@ -582,7 +582,7 @@ public class MapleMonster extends AbstractLoadedMapleLife { return; } - Map> partyExpDist = new HashMap<>(); + Map> partyExpDist = new HashMap<>(); Map soloExpDist = new HashMap<>(); Map mapPlayers = map.getMapAllPlayers(); @@ -593,7 +593,7 @@ public class MapleMonster extends AbstractLoadedMapleLife { if (chr != null) { long damage = e.getValue().longValue(); - MapleParty p = chr.getParty(); + Party p = chr.getParty(); if (p != null) { Map partyParticipation = partyExpDist.get(p); if (partyParticipation == null) { diff --git a/src/main/java/server/maps/MapleDoorObject.java b/src/main/java/server/maps/MapleDoorObject.java index efb6246d1f..9bf380701a 100644 --- a/src/main/java/server/maps/MapleDoorObject.java +++ b/src/main/java/server/maps/MapleDoorObject.java @@ -27,7 +27,7 @@ import net.server.audit.locks.MonitoredReentrantReadWriteLock; import net.server.audit.locks.MonitoredWriteLock; import net.server.audit.locks.factory.MonitoredReadLockFactory; import net.server.audit.locks.factory.MonitoredWriteLockFactory; -import net.server.world.MapleParty; +import net.server.world.Party; import tools.PacketCreator; import java.awt.*; @@ -89,7 +89,7 @@ public class MapleDoorObject extends AbstractMapleMapObject { } public void warp(final Character chr) { - MapleParty party = chr.getParty(); + Party party = chr.getParty(); if (chr.getId() == ownerId || (party != null && party.getMemberById(ownerId) != null)) { chr.sendPacket(PacketCreator.playPortalSound()); @@ -127,7 +127,7 @@ public class MapleDoorObject extends AbstractMapleMapObject { public void sendDestroyData(Client client) { Character chr = client.getPlayer(); if (from.getId() == chr.getMapId()) { - MapleParty party = chr.getParty(); + Party party = chr.getParty(); if (party != null && (ownerId == chr.getId() || party.getMemberById(ownerId) != null)) { client.sendPacket(PacketCreator.partyPortal(999999999, 999999999, new Point(-1, -1))); } diff --git a/src/main/java/server/maps/MapleMap.java b/src/main/java/server/maps/MapleMap.java index c953bd1667..ae394fd96b 100644 --- a/src/main/java/server/maps/MapleMap.java +++ b/src/main/java/server/maps/MapleMap.java @@ -49,7 +49,7 @@ import net.server.services.task.channel.FaceExpressionService; import net.server.services.task.channel.MobMistService; import net.server.services.task.channel.OverallService; import net.server.services.type.ChannelServices; -import net.server.world.MapleParty; +import net.server.world.Party; import net.server.world.World; import scripting.event.EventInstanceManager; import scripting.map.MapScriptManager; @@ -2354,7 +2354,7 @@ public class MapleMap { public void addPlayer(final Character chr) { int chrSize; - MapleParty party = chr.getParty(); + Party party = chr.getParty(); chrWLock.lock(); try { characters.add(chr); @@ -2668,7 +2668,7 @@ public class MapleMap { service.unregisterFaceExpression(mapid, chr); chr.unregisterChairBuff(); - MapleParty party = chr.getParty(); + Party party = chr.getParty(); chrWLock.lock(); try { if (party != null && party.getMemberById(chr.getId()) != null) { diff --git a/src/main/java/server/partyquest/MonsterCarnival.java b/src/main/java/server/partyquest/MonsterCarnival.java index a57e0fbef4..1715ec8281 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.MapleParty; import net.server.world.MaplePartyCharacter; +import net.server.world.Party; import server.TimerManager; import server.maps.MapleMap; import server.maps.MapleReactor; @@ -24,7 +24,7 @@ public class MonsterCarnival { public static int B = 1; public static int A = 0; - private MapleParty p1, p2; + private Party p1, p2; private MapleMap map; private ScheduledFuture timer, effectTimer, respawnTask; private long startTime = 0; @@ -33,7 +33,7 @@ public class MonsterCarnival { private int redCP, blueCP, redTotalCP, blueTotalCP, redTimeupCP, blueTimeupCP; private boolean cpq1; - public MonsterCarnival(MapleParty p1, MapleParty p2, int mapid, boolean cpq1, int room) { + public MonsterCarnival(Party p1, Party p2, int mapid, boolean cpq1, int room) { try { this.cpq1 = cpq1; this.room = room; @@ -400,19 +400,19 @@ public class MonsterCarnival { } } - public MapleParty getRed() { + public Party getRed() { return p1; } - public void setRed(MapleParty p1) { + public void setRed(Party p1) { this.p1 = p1; } - public MapleParty getBlue() { + public Party getBlue() { return p2; } - public void setBlue(MapleParty p2) { + public void setBlue(Party p2) { this.p2 = p2; } diff --git a/src/main/java/server/partyquest/PartyQuest.java b/src/main/java/server/partyquest/PartyQuest.java index d8a64c9821..900923cafe 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.MapleParty; import net.server.world.MaplePartyCharacter; +import net.server.world.Party; import tools.FilePrinter; import java.util.ArrayList; @@ -37,10 +37,10 @@ import java.util.List; */ public class PartyQuest { int channel, world; - MapleParty party; + Party party; List participants = new ArrayList<>(); - public PartyQuest(MapleParty party) { + public PartyQuest(Party party) { this.party = party; MaplePartyCharacter leader = party.getLeader(); channel = leader.getChannel(); @@ -55,7 +55,7 @@ public class PartyQuest { } } - public MapleParty getParty() { + public Party getParty() { return party; } diff --git a/src/main/java/server/partyquest/Pyramid.java b/src/main/java/server/partyquest/Pyramid.java index bac7349e70..ad1c379714 100644 --- a/src/main/java/server/partyquest/Pyramid.java +++ b/src/main/java/server/partyquest/Pyramid.java @@ -23,7 +23,7 @@ package server.partyquest; import client.Character; -import net.server.world.MapleParty; +import net.server.world.Party; import server.MapleItemInformationProvider; import server.TimerManager; import tools.PacketCreator; @@ -57,7 +57,7 @@ public class Pyramid extends PartyQuest { ScheduledFuture timer = null; ScheduledFuture gaugeSchedule = null; - public Pyramid(MapleParty party, PyramidMode mode, int mapid) { + public Pyramid(Party party, PyramidMode mode, int mapid) { super(party); this.mode = mode; this.map = mapid; diff --git a/src/main/java/tools/PacketCreator.java b/src/main/java/tools/PacketCreator.java index 1b6f9b510c..2651ebf67a 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.MapleParty; import net.server.world.MaplePartyCharacter; +import net.server.world.Party; import net.server.world.PartyOperation; import net.server.world.World; import server.CashShop.CashItem; @@ -3682,7 +3682,7 @@ public class PacketCreator { return p; } - public static Packet partyCreated(MapleParty party, int partycharid) { + public static Packet partyCreated(Party party, int partycharid) { final OutPacket p = OutPacket.create(SendOpcode.PARTY_OPERATION); p.writeByte(8); p.writeInt(party.getId()); @@ -3764,7 +3764,7 @@ public class PacketCreator { return p; } - private static void addPartyStatus(int forchannel, MapleParty party, OutPacket p, boolean leaving) { + private static void addPartyStatus(int forchannel, Party party, OutPacket p, boolean leaving) { List partymembers = new ArrayList<>(party.getMembers()); while (partymembers.size() < 6) { partymembers.add(new MaplePartyCharacter()); @@ -3829,7 +3829,7 @@ public class PacketCreator { } } - public static Packet updateParty(int forChannel, MapleParty party, PartyOperation op, MaplePartyCharacter target) { + public static Packet updateParty(int forChannel, Party party, PartyOperation op, MaplePartyCharacter target) { final OutPacket p = OutPacket.create(SendOpcode.PARTY_OPERATION); switch (op) { case DISBAND: