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

Rename and clean up MaplePartyCharacter

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

18
src/main/java/client/Character.java
View File

@@ -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;
}
}

6
src/main/java/client/Client.java
View File

@@ -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;
}

4
src/main/java/net/server/channel/Channel.java
View File

@@ -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<Character> getPartyMembers(Party party) {
List<Character> 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) {

4
src/main/java/net/server/channel/handlers/MonsterCarnivalHandler.java
View File

@@ -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) {

4
src/main/java/net/server/channel/handlers/PartyOperationHandler.java
View File

@@ -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;
}

4
src/main/java/net/server/channel/handlers/PlayerLoggedinHandler.java
View File

@@ -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));

6
src/main/java/net/server/coordinator/matchchecker/listener/MatchCheckerCPQChallenge.java
View File

@@ -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<MaplePartyCharacter> chrMembers = new LinkedList<>();
for (MaplePartyCharacter mpc : chr.getParty().getMembers()) {
List<PartyCharacter> chrMembers = new LinkedList<>();
for (PartyCharacter mpc : chr.getParty().getMembers()) {
if (mpc.isOnline()) {
chrMembers.add(mpc);
}

4
src/main/java/net/server/guild/Alliance.java
View File

@@ -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<Character> getPartyGuildMasters(Party party) {
List<Character> 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();

56
src/main/java/net/server/world/Party.java
View File

@@ -44,8 +44,8 @@ public class Party {
private int id;
private Party enemy = null;
private int leaderId;
private final List<MaplePartyCharacter> members = new LinkedList<>();
private List<MaplePartyCharacter> pqMembers = null;
private final List<PartyCharacter> members = new LinkedList<>();
private List<PartyCharacter> pqMembers = null;
private final Map<Integer, Integer> 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<MaplePartyCharacter> getMembers() {
public Collection<PartyCharacter> getMembers() {
lock.lock();
try {
return new LinkedList<>(members);
@@ -131,7 +131,7 @@ public class Party {
}
}
public List<MaplePartyCharacter> getPartyMembers() {
public List<PartyCharacter> getPartyMembers() {
lock.lock();
try {
return new LinkedList<>(members);
@@ -140,12 +140,12 @@ public class Party {
}
}
public List<MaplePartyCharacter> getPartyMembersOnline() {
public List<PartyCharacter> getPartyMembersOnline() {
lock.lock();
try {
List<MaplePartyCharacter> ret = new LinkedList<>();
List<PartyCharacter> 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<MaplePartyCharacter> getEligibleMembers() {
public Collection<PartyCharacter> getEligibleMembers() {
return Collections.unmodifiableList(pqMembers);
}
public void setEligibleMembers(List<MaplePartyCharacter> eliParty) {
public void setEligibleMembers(List<PartyCharacter> 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) {

35
src/main/java/net/server/world/MaplePartyCharacter.java → src/main/java/net/server/world/PartyCharacter.java
View File

@@ -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;
}
}

18
src/main/java/net/server/world/World.java
View File

@@ -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<MaplePartyCharacter> partyMembers) {
private void updateCharacterParty(Party party, PartyOperation operation, PartyCharacter target, Collection<PartyCharacter> 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<MaplePartyCharacter> partyMembers = party.getMembers();
private void updateParty(Party party, PartyOperation operation, PartyCharacter target) {
Collection<PartyCharacter> 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) {

8
src/main/java/scripting/AbstractPlayerInteraction.java
View File

@@ -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;
}

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

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

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

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

32
src/main/java/scripting/npc/NPCConversationManager.java
View File

@@ -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<MaplePartyCharacter> otherParty;
private List<PartyCharacter> otherParty;
private Map<Integer, String> 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<MaplePartyCharacter> otherParty, boolean test) {
public NPCConversationManager(Client c, int npc, List<PartyCharacter> 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<MaplePartyCharacter> partyMembers = party.getPartyMembers();
for (MaplePartyCharacter pchr : partyMembers) {
List<PartyCharacter> 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);

4
src/main/java/scripting/npc/NPCScriptManager.java
View File

@@ -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<MaplePartyCharacter> chrs) {
public void start(String filename, Client c, int npc, List<PartyCharacter> chrs) {
try {
final NPCConversationManager cm = new NPCConversationManager(c, npc, chrs, true);
cm.dispose();

4
src/main/java/server/MapleStatEffect.java
View File

@@ -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) {

4
src/main/java/server/life/MapleMonster.java
View File

@@ -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);

30
src/main/java/server/partyquest/MonsterCarnival.java
View File

@@ -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) {

6
src/main/java/server/partyquest/PartyQuest.java
View File

@@ -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)

22
src/main/java/tools/PacketCreator.java
View File

@@ -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<MaplePartyCharacter> partymembers = new ArrayList<>(party.getMembers());
List<PartyCharacter> 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<Integer, MapleDoor> 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: