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

Fix missing static imports of TimeUnit

Browse Source
This commit is contained in:
P0nk
2021-09-10 19:18:20 +02:00
parent cdc17ef3dd
commit 8b60684103
10 changed files with 40 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/net/server/channel/handlers/ItemRewardHandler.java
View File

@@ -63,6 +63,7 @@ public final class ItemRewardHandler extends AbstractPacketHandler {
if (ItemConstants.getInventoryType(reward.itemid) == InventoryType.EQUIP) {
final Item item = ii.getEquipById(reward.itemid);
if (reward.period != -1) {
// TODO is this a bug, meant to be 60 * 60 * 1000?
item.setExpiration(currentServerTime() + reward.period * 60 * 60 * 10);
}
InventoryManipulator.addFromDrop(c, item, false);

5
src/main/java/net/server/coordinator/session/HostHwid.java
View File

@@ -3,7 +3,8 @@ package net.server.coordinator.session;
import net.server.Server;
import java.time.Instant;
import java.util.concurrent.TimeUnit;
import static java.util.concurrent.TimeUnit.DAYS;
record HostHwid(Hwid hwid, Instant expiry) {
static HostHwid createWithDefaultExpiry(Hwid hwid) {
@@ -11,6 +12,6 @@ record HostHwid(Hwid hwid, Instant expiry) {
}
private static Instant getDefaultExpiry() {
return Instant.ofEpochMilli(Server.getInstance().getCurrentTime() + TimeUnit.DAYS.toMillis(7));
return Instant.ofEpochMilli(Server.getInstance().getCurrentTime() + DAYS.toMillis(7));
}
}

12
src/main/java/net/server/coordinator/session/HwidAssociationExpiry.java
View File

@@ -3,7 +3,9 @@ package net.server.coordinator.session;
import net.server.Server;
import java.time.Instant;
import java.util.concurrent.TimeUnit;
import static java.util.concurrent.TimeUnit.DAYS;
import static java.util.concurrent.TimeUnit.HOURS;
public class HwidAssociationExpiry {
public static Instant getHwidAccountExpiry(int relevance) {
@@ -15,9 +17,9 @@ public class HwidAssociationExpiry {
final long baseHours = switch (degree) {
case 0 -> 2;
case 1 -> TimeUnit.DAYS.toHours(1);
case 2 -> TimeUnit.DAYS.toHours(7);
default -> TimeUnit.DAYS.toHours(70);
case 1 -> DAYS.toHours(1);
case 2 -> DAYS.toHours(7);
default -> DAYS.toHours(70);
};
int subdegreeTime = (degree * 3) + 1;
@@ -25,7 +27,7 @@ public class HwidAssociationExpiry {
subdegreeTime = 10;
}
return TimeUnit.HOURS.toMillis(baseHours + subdegreeTime);
return HOURS.toMillis(baseHours + subdegreeTime);
}
private static int getHwidExpirationDegree(int relevance) {