Sweetgum/sweetgum-server
1
0
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

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