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

Rename and clean up MapleExpedition

Browse Source
This commit is contained in:
P0nk
2021-09-09 21:59:17 +02:00
parent fbffb7ef71
commit 1e00505671
11 changed files with 462 additions and 444 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/scripting/AbstractPlayerInteraction.java
View File

@@ -38,7 +38,7 @@ import scripting.event.EventManager;
import scripting.npc.NPCScriptManager;
import server.MapleItemInformationProvider;
import server.MapleMarriage;
import server.expeditions.MapleExpedition;
import server.expeditions.Expedition;
import server.expeditions.MapleExpeditionBossLog;
import server.expeditions.MapleExpeditionType;
import server.life.*;
@@ -1073,7 +1073,7 @@ public class AbstractPlayerInteraction {
public int createExpedition(MapleExpeditionType type, boolean silent, int minPlayers, int maxPlayers) {
Character player = getPlayer();
MapleExpedition exped = new MapleExpedition(player, type, silent, minPlayers, maxPlayers);
Expedition exped = new Expedition(player, type, silent, minPlayers, maxPlayers);
int channel = player.getMap().getChannelServer().getId();
if (!MapleExpeditionBossLog.attemptBoss(player.getId(), channel, exped, false)) { // thanks Conrad for noticing missing expeditions entry limit
@@ -1087,18 +1087,18 @@ public class AbstractPlayerInteraction {
}
}
public void endExpedition(MapleExpedition exped) {
public void endExpedition(Expedition exped) {
exped.dispose(true);
exped.removeChannelExpedition(getPlayer().getClient().getChannelServer());
}
public MapleExpedition getExpedition(MapleExpeditionType type) {
public Expedition getExpedition(MapleExpeditionType type) {
return getPlayer().getClient().getChannelServer().getExpedition(type);
}
public String getExpeditionMemberNames(MapleExpeditionType type) {
String members = "";
MapleExpedition exped = getExpedition(type);
Expedition exped = getExpedition(type);
for (String memberName : exped.getMembers().values()) {
members += "" + memberName + ", ";
}
@@ -1106,7 +1106,7 @@ public class AbstractPlayerInteraction {
}
public boolean isLeaderExpedition(MapleExpeditionType type) {
MapleExpedition exped = getExpedition(type);
Expedition exped = getExpedition(type);
return exped.isLeader(getPlayer());
}