Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-01-06 16:37:38 +01:00
Code Issues Projects Releases Wiki Activity

Replaced Tick and ChronoUnit with TimeUnit for consistency

Browse Source
This commit is contained in:
Németh Noel 2021-06-30 13:04:59 +02:00
parent 117bcb467a
commit c037ea9d84
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/net/minestom/server/entity/LivingEntity.java
View File

@ -30,12 +30,11 @@ import net.minestom.server.utils.Position;
import net.minestom.server.utils.Vector; import net.minestom.server.utils.Vector;
import net.minestom.server.utils.block.BlockIterator; import net.minestom.server.utils.block.BlockIterator;
import net.minestom.server.utils.time.Cooldown; import net.minestom.server.utils.time.Cooldown;
import net.minestom.server.utils.time.Tick; import net.minestom.server.utils.time.TimeUnit;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import java.time.Duration; import java.time.Duration;
import java.time.temporal.ChronoUnit;
import java.time.temporal.TemporalUnit; import java.time.temporal.TemporalUnit;
import java.util.*; import java.util.*;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
@ -44,7 +43,7 @@ public class LivingEntity extends Entity implements EquipmentHandler {
// ItemStack pickup // ItemStack pickup
protected boolean canPickupItem; protected boolean canPickupItem;
protected Cooldown itemPickupCooldown = new Cooldown(Duration.of(5, Tick.SERVER_TICKS)); protected Cooldown itemPickupCooldown = new Cooldown(Duration.of(5, TimeUnit.SERVER_TICK));
protected boolean isDead; protected boolean isDead;
@ -318,7 +317,7 @@ public class LivingEntity extends Entity implements EquipmentHandler {
* @param duration duration in ticks of the effect * @param duration duration in ticks of the effect
*/ */
public void setFireForDuration(int duration) { public void setFireForDuration(int duration) {
setFireForDuration(duration, Tick.SERVER_TICKS); setFireForDuration(duration, TimeUnit.SERVER_TICK);
} }
/** /**
@ -334,7 +333,7 @@ public class LivingEntity extends Entity implements EquipmentHandler {
// Do not start fire event if the fire needs to be removed (< 0 duration) // Do not start fire event if the fire needs to be removed (< 0 duration)
if (duration > 0) { if (duration > 0) {
EventDispatcher.callCancellable(entityFireEvent, () -> { EventDispatcher.callCancellable(entityFireEvent, () -> {
final long fireTime = entityFireEvent.getFireTime(ChronoUnit.MILLIS); final long fireTime = entityFireEvent.getFireTime(TimeUnit.MILLISECOND);
setOnFire(true); setOnFire(true);
fireExtinguishTime = System.currentTimeMillis() + fireTime; fireExtinguishTime = System.currentTimeMillis() + fireTime;
}); });