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