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
src/main/java/client/Character.java
+9 -9
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;
}
}
src/main/java/client/Client.java
+3 -3
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;
}