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

Turn map id magic numbers into constants

Browse Source
This commit is contained in:
P0nk
2021-11-07 14:26:34 +01:00
parent c022c3595f
commit b15a7e61d4
51 changed files with 615 additions and 341 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/server/partyquest/AriantColiseum.java
View File

@@ -22,6 +22,7 @@ package server.partyquest;
import client.Character;
import constants.game.GameConstants;
import constants.id.ItemId;
import constants.id.MapId;
import server.TimerManager;
import server.expeditions.Expedition;
import server.expeditions.ExpeditionType;
@@ -249,9 +250,9 @@ public class AriantColiseum {
private ExpeditionType getExpeditionType() {
ExpeditionType type;
if (map.getId() == 980010101) {
if (map.getId() == MapId.ARPQ_ARENA_1) {
type = ExpeditionType.ARIANT;
} else if (map.getId() == 980010201) {
} else if (map.getId() == MapId.ARPQ_ARENA_2) {
type = ExpeditionType.ARIANT1;
} else {
type = ExpeditionType.ARIANT2;
@@ -265,7 +266,7 @@ public class AriantColiseum {
cancelAriantSchedules();
for (Character chr : map.getAllPlayers()) {
chr.changeMap(980010010, 0);
chr.changeMap(MapId.ARPQ_KINGS_ROOM, 0);
}
}
@@ -275,7 +276,7 @@ public class AriantColiseum {
for (Character chr : exped.getActiveMembers()) {
chr.setAriantColiseum(null);
chr.changeMap(980010000, 0);
chr.changeMap(MapId.ARPQ_LOBBY, 0);
}
map.getWorldServer().registerTimedMapObject(() -> {