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

6
src/main/java/server/life/MobSkillFactory.java
View File

@@ -39,6 +39,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import static java.util.concurrent.TimeUnit.SECONDS;
/**
* @author Danny (Leifde)
*/
@@ -82,8 +84,8 @@ public class MobSkillFactory {
int x = DataTool.getInt("x", skillData, 1);
int y = DataTool.getInt("y", skillData, 1);
int count = DataTool.getInt("count", skillData, 1);
long duration = DataTool.getInt("time", skillData, 0) * 1000;
long cooltime = DataTool.getInt("interval", skillData, 0) * 1000;
long duration = SECONDS.toMillis(DataTool.getInt("time", skillData, 0));
long cooltime = SECONDS.toMillis(DataTool.getInt("interval", skillData, 0));
int iprop = DataTool.getInt("prop", skillData, 100);
float prop = iprop / 100;
int limit = DataTool.getInt("limit", skillData, 0);

4
src/main/java/server/life/SpawnPoint.java
View File

@@ -27,6 +27,8 @@ import net.server.Server;
import java.awt.*;
import java.util.concurrent.atomic.AtomicInteger;
import static java.util.concurrent.TimeUnit.SECONDS;
public class SpawnPoint {
private final int monster;
private final int mobTime;
@@ -87,7 +89,7 @@ public class SpawnPoint {
public void monsterKilled(int aniTime) {
nextPossibleSpawn = Server.getInstance().getCurrentTime();
if (mobTime > 0) {
nextPossibleSpawn += mobTime * 1000;
nextPossibleSpawn += SECONDS.toMillis(mobTime);
} else {
nextPossibleSpawn += aniTime;
}