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

Rename and clean up MapleExpeditionType

Browse Source
This commit is contained in:
P0nk
2021-09-09 22:00:48 +02:00
parent 5a6ed83545
commit 14344568f2
15 changed files with 74 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,7 +40,7 @@ import server.MapleItemInformationProvider;
import server.MapleMarriage;
import server.expeditions.Expedition;
import server.expeditions.ExpeditionBossLog;
import server.expeditions.MapleExpeditionType;
import server.expeditions.ExpeditionType;
import server.life.*;
import server.maps.MapleMap;
import server.maps.MapleMapObject;
@@ -1067,11 +1067,11 @@ public class AbstractPlayerInteraction {
return (Pyramid) getPlayer().getPartyQuest();
}
public int createExpedition(MapleExpeditionType type) {
public int createExpedition(ExpeditionType type) {
return createExpedition(type, false, 0, 0);
}
public int createExpedition(MapleExpeditionType type, boolean silent, int minPlayers, int maxPlayers) {
public int createExpedition(ExpeditionType type, boolean silent, int minPlayers, int maxPlayers) {
Character player = getPlayer();
Expedition exped = new Expedition(player, type, silent, minPlayers, maxPlayers);
@@ -1092,11 +1092,11 @@ public class AbstractPlayerInteraction {
exped.removeChannelExpedition(getPlayer().getClient().getChannelServer());
}
public Expedition getExpedition(MapleExpeditionType type) {
public Expedition getExpedition(ExpeditionType type) {
return getPlayer().getClient().getChannelServer().getExpedition(type);
}
public String getExpeditionMemberNames(MapleExpeditionType type) {
public String getExpeditionMemberNames(ExpeditionType type) {
String members = "";
Expedition exped = getExpedition(type);
for (String memberName : exped.getMembers().values()) {
@@ -1105,7 +1105,7 @@ public class AbstractPlayerInteraction {
return members;
}
public boolean isLeaderExpedition(MapleExpeditionType type) {
public boolean isLeaderExpedition(ExpeditionType type) {
Expedition exped = getExpedition(type);
return exped.isLeader(getPlayer());
}

4
src/main/java/scripting/npc/NPCConversationManager.java
View File

@@ -46,7 +46,7 @@ import server.*;
import server.MapleSkillbookInformationProvider.SkillBookEntry;
import server.events.gm.Event;
import server.expeditions.Expedition;
import server.expeditions.MapleExpeditionType;
import server.expeditions.ExpeditionType;
import server.gachapon.MapleGachapon;
import server.gachapon.MapleGachapon.MapleGachaponItem;
import server.life.MapleLifeFactory;
@@ -1024,7 +1024,7 @@ public class NPCConversationManager extends AbstractPlayerInteraction {
return true;
}
public String startAriantBattle(MapleExpeditionType expedType, int mapid) {
public String startAriantBattle(ExpeditionType expedType, int mapid) {
if (!GameConstants.isAriantColiseumLobby(mapid)) {
return "You cannot start an Ariant tournament from outside the Battle Arena Entrance.";
}