Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-01-09 01:47:54 +01:00
Code Issues Projects Releases Wiki Activity

fix title ticks

Browse Source
This commit is contained in:
Kieran Wallbanks 2021-03-04 13:41:25 +00:00
parent 87b30a8361
commit f2897eedca
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/net/minestom/server/network/packet/server/play/TitlePacket.java
View File

@ -115,8 +115,9 @@ public class TitlePacket implements ServerPacket {
// times packet // times packet
Title.Times times = title.times(); Title.Times times = title.times();
if (times != null) { if (times != null) {
packets.add(new TitlePacket(TickUtils.fromDuration(times.fadeIn()), TickUtils.fromDuration(times.stay()), packets.add(new TitlePacket(TickUtils.fromDuration(times.fadeIn(), TickUtils.CLIENT_TICK_MS),
TickUtils.fromDuration(times.fadeOut()))); TickUtils.fromDuration(times.stay(), TickUtils.CLIENT_TICK_MS),
TickUtils.fromDuration(times.fadeOut(), TickUtils.CLIENT_TICK_MS)));
} }
return packets; return packets;

22
src/main/java/net/minestom/server/utils/TickUtils.java
View File

@ -10,6 +10,15 @@ import java.time.Duration;
* Tick related utilities. * Tick related utilities.
*/ */
public class TickUtils { public class TickUtils {
/**
* Number of ticks per second for the default Java-edition client.
*/
public static final int CLIENT_TPS = 20;
/**
* Length of time per tick for the default Java-edition client.
*/
public static final int CLIENT_TICK_MS = 50;
/** /**
* Creates a number of ticks from a given duration, based on {@link MinecraftServer#TICK_MS}. * Creates a number of ticks from a given duration, based on {@link MinecraftServer#TICK_MS}.
@ -18,8 +27,19 @@ public class TickUtils {
* @throws IllegalArgumentException if duration is negative * @throws IllegalArgumentException if duration is negative
*/ */
public static int fromDuration(@NotNull Duration duration) { public static int fromDuration(@NotNull Duration duration) {
return TickUtils.fromDuration(duration, MinecraftServer.TICK_MS);
}
/**
* Creates a number of ticks from a given duration.
* @param duration the duration
* @param msPerTick the number of milliseconds per tick
* @return the number of ticks
* @throws IllegalArgumentException if duration is negative
*/
public static int fromDuration(@NotNull Duration duration, int msPerTick) {
Validate.isTrue(!duration.isNegative(), "Duration cannot be negative"); Validate.isTrue(!duration.isNegative(), "Duration cannot be negative");
return (int) (duration.toMillis() / MinecraftServer.TICK_MS); return (int) (duration.toMillis() / msPerTick);
} }
} }