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

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

@@ -45,7 +45,7 @@ import scripting.AbstractPlayerInteraction;
import server.*;
import server.MapleSkillbookInformationProvider.SkillBookEntry;
import server.events.gm.Event;
import server.expeditions.MapleExpedition;
import server.expeditions.Expedition;
import server.expeditions.MapleExpeditionType;
import server.gachapon.MapleGachapon;
import server.gachapon.MapleGachapon.MapleGachaponItem;
@@ -1014,7 +1014,7 @@ public class NPCConversationManager extends AbstractPlayerInteraction {
}
}
private synchronized boolean setupAriantBattle(MapleExpedition exped, int mapid) {
private synchronized boolean setupAriantBattle(Expedition exped, int mapid) {
MapleMap arenaMap = this.getMap().getChannelServer().getMapFactory().getMap(mapid + 1);
if (!arenaMap.getAllPlayers().isEmpty()) {
return false;
@@ -1029,7 +1029,7 @@ public class NPCConversationManager extends AbstractPlayerInteraction {
return "You cannot start an Ariant tournament from outside the Battle Arena Entrance.";
}
MapleExpedition exped = this.getMap().getChannelServer().getExpedition(expedType);
Expedition exped = this.getMap().getChannelServer().getExpedition(expedType);
if (exped == null) {
return "Please register on an expedition before attempting to start an Ariant tournament.";
}