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

Use TimeUnit for time calculations

Browse Source
This commit is contained in:
P0nk
2021-09-10 18:56:03 +02:00
parent d52aedac4f
commit cdc17ef3dd
49 changed files with 268 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/server/maps/MapFactory.java
View File

@@ -41,6 +41,8 @@ import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import static java.util.concurrent.TimeUnit.SECONDS;
public class MapFactory {
private static final Data nameData;
private static final DataProvider mapSource;
@@ -357,7 +359,7 @@ public class MapFactory {
int y = DataTool.getInt(reactor.getChildByPath("y"));
myReactor.setFacingDirection(FacingDirection);
myReactor.setPosition(new Point(x, y));
myReactor.setDelay(DataTool.getInt(reactor.getChildByPath("reactorTime")) * 1000);
myReactor.setDelay((int) SECONDS.toMillis(DataTool.getInt(reactor.getChildByPath("reactorTime"))));
myReactor.setName(DataTool.getString(reactor.getChildByPath("name"), ""));
myReactor.resetReactorActions(0);
return myReactor;

4
src/main/java/server/maps/MapItem.java
View File

@@ -30,6 +30,8 @@ import tools.PacketCreator;
import java.awt.*;
import java.util.concurrent.locks.Lock;
import static java.util.concurrent.TimeUnit.SECONDS;
public class MapItem extends AbstractMapObject {
protected Client ownerClient;
protected Item item;
@@ -128,7 +130,7 @@ public class MapItem extends AbstractMapObject {
}
public final boolean hasExpiredOwnershipTime() {
return System.currentTimeMillis() - dropTime >= 15 * 1000;
return System.currentTimeMillis() - dropTime >= SECONDS.toMillis(15);
}
public final boolean canBePickedBy(Character chr) {

21
src/main/java/server/maps/MapleMap.java
View File

@@ -77,6 +77,9 @@ import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.locks.Lock;
import java.util.function.Predicate;
import static java.util.concurrent.TimeUnit.MINUTES;
import static java.util.concurrent.TimeUnit.SECONDS;
public class MapleMap {
private static final List<MapObjectType> rangedMapobjectTypes = Arrays.asList(MapObjectType.SHOP, MapObjectType.ITEM, MapObjectType.NPC, MapObjectType.MONSTER, MapObjectType.DOOR, MapObjectType.SUMMON, MapObjectType.REACTOR);
@@ -1880,11 +1883,11 @@ public class MapleMap {
if (selfDestruction == null) {
removeAfterAction = () -> killMonster(monster, null, false);
registerMapSchedule(removeAfterAction, monster.getStats().removeAfter() * 1000);
registerMapSchedule(removeAfterAction, SECONDS.toMillis(monster.getStats().removeAfter()));
} else {
removeAfterAction = () -> killMonster(monster, null, false, selfDestruction.getAction());
registerMapSchedule(removeAfterAction, selfDestruction.removeAfter() * 1000);
registerMapSchedule(removeAfterAction, SECONDS.toMillis(selfDestruction.removeAfter()));
}
monster.pushRemoveAfterAction(removeAfterAction);
@@ -2396,7 +2399,7 @@ public class MapleMap {
}
if (mapid == 200090060) { // To Rien
int travelTime = getWorldServer().getTransportationTime(1 * 60 * 1000);
int travelTime = getWorldServer().getTransportationTime((int) MINUTES.toMillis(1));
chr.sendPacket(PacketCreator.getClock(travelTime / 1000));
TimerManager.getInstance().schedule(() -> {
if (chr.getMapId() == 200090060) {
@@ -2404,7 +2407,7 @@ public class MapleMap {
}
}, travelTime);
} else if (mapid == 200090070) { // To Lith Harbor
int travelTime = getWorldServer().getTransportationTime(1 * 60 * 1000);
int travelTime = getWorldServer().getTransportationTime((int) MINUTES.toMillis(1));
chr.sendPacket(PacketCreator.getClock(travelTime / 1000));
TimerManager.getInstance().schedule(() -> {
if (chr.getMapId() == 200090070) {
@@ -2412,7 +2415,7 @@ public class MapleMap {
}
}, travelTime);
} else if (mapid == 200090030) { // To Ereve (SkyFerry)
int travelTime = getWorldServer().getTransportationTime(2 * 60 * 1000);
int travelTime = getWorldServer().getTransportationTime((int) MINUTES.toMillis(2));
chr.sendPacket(PacketCreator.getClock(travelTime / 1000));
TimerManager.getInstance().schedule(() -> {
if (chr.getMapId() == 200090030) {
@@ -2420,7 +2423,7 @@ public class MapleMap {
}
}, travelTime);
} else if (mapid == 200090031) { // To Victoria Island (SkyFerry)
int travelTime = getWorldServer().getTransportationTime(2 * 60 * 1000);
int travelTime = getWorldServer().getTransportationTime((int) MINUTES.toMillis(2));
chr.sendPacket(PacketCreator.getClock(travelTime / 1000));
TimerManager.getInstance().schedule(() -> {
if (chr.getMapId() == 200090031) {
@@ -2428,7 +2431,7 @@ public class MapleMap {
}
}, travelTime);
} else if (mapid == 200090021) { // To Orbis (SkyFerry)
int travelTime = getWorldServer().getTransportationTime(8 * 60 * 1000);
int travelTime = getWorldServer().getTransportationTime((int) MINUTES.toMillis(8));
chr.sendPacket(PacketCreator.getClock(travelTime / 1000));
TimerManager.getInstance().schedule(() -> {
if (chr.getMapId() == 200090021) {
@@ -2436,7 +2439,7 @@ public class MapleMap {
}
}, travelTime);
} else if (mapid == 200090020) { // To Ereve From Orbis (SkyFerry)
int travelTime = getWorldServer().getTransportationTime(8 * 60 * 1000);
int travelTime = getWorldServer().getTransportationTime((int) MINUTES.toMillis(8));
chr.sendPacket(PacketCreator.getClock(travelTime / 1000));
TimerManager.getInstance().schedule(() -> {
if (chr.getMapId() == 200090020) {
@@ -2449,7 +2452,7 @@ public class MapleMap {
mmd.registerPlayer(chr);
}
} else if (GameConstants.isAriantColiseumArena(mapid)) {
int pqTimer = (10 * 60 * 1000);
int pqTimer = (int) MINUTES.toMillis(10);
chr.sendPacket(PacketCreator.getClock(pqTimer / 1000));
}

4
src/main/java/server/maps/MiniDungeon.java
View File

@@ -30,6 +30,8 @@ import java.util.List;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.locks.Lock;
import static java.util.concurrent.TimeUnit.SECONDS;
/**
* @author Ronan
*/
@@ -43,7 +45,7 @@ public class MiniDungeon {
public MiniDungeon(int base, long timeLimit) {
baseMap = base;
expireTime = timeLimit * 1000;
expireTime = SECONDS.toMillis(timeLimit);
timeoutTask = TimerManager.getInstance().schedule(() -> close(), expireTime);

4
src/main/java/server/maps/MiniGame.java
View File

@@ -31,6 +31,8 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import static java.util.concurrent.TimeUnit.MINUTES;
/**
* @author Matze
* @author Ronan (HeavenMS)
@@ -284,7 +286,7 @@ public class MiniGame extends AbstractMapObject {
visitorscore += 10;
ownerscore += 10;
nextavailabletie = timeNow + 5 * 60 * 1000;
nextavailabletie = timeNow + MINUTES.toMillis(5);
}
this.broadcast(PacketCreator.getMiniGameTie(this));