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

Rename and clean up MapleParty

Browse Source
This commit is contained in:
P0nk
2021-09-09 21:44:09 +02:00
parent 5aa0368090
commit 714df342d9
24 changed files with 157 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/server/MapleStatEffect.java
+2 -2
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.MapleParty;
import net.server.world.MaplePartyCharacter;
import net.server.world.Party;
import provider.MapleData;
import provider.MapleDataTool;
import server.life.MapleMonster;
@@ -1039,7 +1039,7 @@ public class MapleStatEffect {
final MCSkill skill = MapleCarnivalFactory.getInstance().getSkill(nuffSkill);
if (skill != null) {
final Disease dis = skill.getDisease();
MapleParty opposition = applyfrom.getParty().getEnemy();
Party opposition = applyfrom.getParty().getEnemy();
if (skill.targetsAll) {
for (MaplePartyCharacter enemyChrs : opposition.getPartyMembers()) {
Character chrApp = enemyChrs.getPlayer();
src/main/java/server/life/MapleMonster.java
+3 -3
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.MapleParty;
import net.server.world.MaplePartyCharacter;
import net.server.world.Party;
import scripting.event.EventInstanceManager;
import server.MapleStatEffect;
import server.TimerManager;
@@ -582,7 +582,7 @@ public class MapleMonster extends AbstractLoadedMapleLife {
return;
}
Map<MapleParty, Map<Character, Long>> partyExpDist = new HashMap<>();
Map<Party, Map<Character, Long>> partyExpDist = new HashMap<>();
Map<Character, Long> soloExpDist = new HashMap<>();
Map<Integer, Character> mapPlayers = map.getMapAllPlayers();
@@ -593,7 +593,7 @@ public class MapleMonster extends AbstractLoadedMapleLife {
if (chr != null) {
long damage = e.getValue().longValue();
MapleParty p = chr.getParty();
Party p = chr.getParty();
if (p != null) {
Map<Character, Long> partyParticipation = partyExpDist.get(p);
if (partyParticipation == null) {
src/main/java/server/maps/MapleDoorObject.java
+3 -3
View File
@@ -27,7 +27,7 @@ import net.server.audit.locks.MonitoredReentrantReadWriteLock;
import net.server.audit.locks.MonitoredWriteLock;
import net.server.audit.locks.factory.MonitoredReadLockFactory;
import net.server.audit.locks.factory.MonitoredWriteLockFactory;
import net.server.world.MapleParty;
import net.server.world.Party;
import tools.PacketCreator;
import java.awt.*;
@@ -89,7 +89,7 @@ public class MapleDoorObject extends AbstractMapleMapObject {
}
public void warp(final Character chr) {
MapleParty party = chr.getParty();
Party party = chr.getParty();
if (chr.getId() == ownerId || (party != null && party.getMemberById(ownerId) != null)) {
chr.sendPacket(PacketCreator.playPortalSound());
@@ -127,7 +127,7 @@ public class MapleDoorObject extends AbstractMapleMapObject {
public void sendDestroyData(Client client) {
Character chr = client.getPlayer();
if (from.getId() == chr.getMapId()) {
MapleParty party = chr.getParty();
Party party = chr.getParty();
if (party != null && (ownerId == chr.getId() || party.getMemberById(ownerId) != null)) {
client.sendPacket(PacketCreator.partyPortal(999999999, 999999999, new Point(-1, -1)));
}
src/main/java/server/maps/MapleMap.java
+3 -3
View File
@@ -49,7 +49,7 @@ import net.server.services.task.channel.FaceExpressionService;
import net.server.services.task.channel.MobMistService;
import net.server.services.task.channel.OverallService;
import net.server.services.type.ChannelServices;
import net.server.world.MapleParty;
import net.server.world.Party;
import net.server.world.World;
import scripting.event.EventInstanceManager;
import scripting.map.MapScriptManager;
@@ -2354,7 +2354,7 @@ public class MapleMap {
public void addPlayer(final Character chr) {
int chrSize;
MapleParty party = chr.getParty();
Party party = chr.getParty();
chrWLock.lock();
try {
characters.add(chr);
@@ -2668,7 +2668,7 @@ public class MapleMap {
service.unregisterFaceExpression(mapid, chr);
chr.unregisterChairBuff();
MapleParty party = chr.getParty();
Party party = chr.getParty();
chrWLock.lock();
try {
if (party != null && party.getMemberById(chr.getId()) != null) {
src/main/java/server/partyquest/MonsterCarnival.java
+7 -7
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.MapleParty;
import net.server.world.MaplePartyCharacter;
import net.server.world.Party;
import server.TimerManager;
import server.maps.MapleMap;
import server.maps.MapleReactor;
@@ -24,7 +24,7 @@ public class MonsterCarnival {
public static int B = 1;
public static int A = 0;
private MapleParty p1, p2;
private Party p1, p2;
private MapleMap map;
private ScheduledFuture<?> timer, effectTimer, respawnTask;
private long startTime = 0;
@@ -33,7 +33,7 @@ public class MonsterCarnival {
private int redCP, blueCP, redTotalCP, blueTotalCP, redTimeupCP, blueTimeupCP;
private boolean cpq1;
public MonsterCarnival(MapleParty p1, MapleParty p2, int mapid, boolean cpq1, int room) {
public MonsterCarnival(Party p1, Party p2, int mapid, boolean cpq1, int room) {
try {
this.cpq1 = cpq1;
this.room = room;
@@ -400,19 +400,19 @@ public class MonsterCarnival {
}
}
public MapleParty getRed() {
public Party getRed() {
return p1;
}
public void setRed(MapleParty p1) {
public void setRed(Party p1) {
this.p1 = p1;
}
public MapleParty getBlue() {
public Party getBlue() {
return p2;
}
public void setBlue(MapleParty p2) {
public void setBlue(Party p2) {
this.p2 = p2;
}
src/main/java/server/partyquest/PartyQuest.java
+4 -4
View File
@@ -24,8 +24,8 @@ package server.partyquest;
import client.Character;
import net.server.Server;
import net.server.world.MapleParty;
import net.server.world.MaplePartyCharacter;
import net.server.world.Party;
import tools.FilePrinter;
import java.util.ArrayList;
@@ -37,10 +37,10 @@ import java.util.List;
*/
public class PartyQuest {
int channel, world;
MapleParty party;
Party party;
List<Character> participants = new ArrayList<>();
public PartyQuest(MapleParty party) {
public PartyQuest(Party party) {
this.party = party;
MaplePartyCharacter leader = party.getLeader();
channel = leader.getChannel();
@@ -55,7 +55,7 @@ public class PartyQuest {
}
}
public MapleParty getParty() {
public Party getParty() {
return party;
}
src/main/java/server/partyquest/Pyramid.java
+2 -2
View File
@@ -23,7 +23,7 @@
package server.partyquest;
import client.Character;
import net.server.world.MapleParty;
import net.server.world.Party;
import server.MapleItemInformationProvider;
import server.TimerManager;
import tools.PacketCreator;
@@ -57,7 +57,7 @@ public class Pyramid extends PartyQuest {
ScheduledFuture<?> timer = null;
ScheduledFuture<?> gaugeSchedule = null;
public Pyramid(MapleParty party, PyramidMode mode, int mapid) {
public Pyramid(Party party, PyramidMode mode, int mapid) {
super(party);
this.mode = mode;
this.map = mapid;