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

8
src/main/java/server/expeditions/Expedition.java
View File

@@ -81,7 +81,7 @@ public class Expedition {
};
private final Character leader;
private final MapleExpeditionType type;
private final ExpeditionType type;
private boolean registering;
private final MapleMap startMap;
private final List<String> bossLogs;
@@ -95,7 +95,7 @@ public class Expedition {
private final int maxSize;
private final MonitoredReentrantLock pL = MonitoredReentrantLockFactory.createLock(MonitoredLockType.EIM_PARTY, true);
public Expedition(Character player, MapleExpeditionType met, boolean sil, int minPlayers, int maxPlayers) {
public Expedition(Character player, ExpeditionType met, boolean sil, int minPlayers, int maxPlayers) {
leader = player;
members.put(player.getId(), player.getName());
startMap = player.getMap();
@@ -252,7 +252,7 @@ public class Expedition {
if (!silent) {
player.dropMessage(6, "[Expedition] You have been banned from this expedition.");
}
if (MapleExpeditionType.ARIANT.equals(type) || MapleExpeditionType.ARIANT1.equals(type) || MapleExpeditionType.ARIANT2.equals(type)) {
if (ExpeditionType.ARIANT.equals(type) || ExpeditionType.ARIANT1.equals(type) || ExpeditionType.ARIANT2.equals(type)) {
player.changeMap(980010000);
}
}
@@ -287,7 +287,7 @@ public class Expedition {
}
}
public MapleExpeditionType getType() {
public ExpeditionType getType() {
return type;
}