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