Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-23 02:55:47 +01:00
Code Issues Projects Releases Wiki Activity

Fix Tick::addTo/::between causing SOE (#8824)

Browse Source
This commit is contained in:
Emily 2023-02-09 14:30:30 -03:00 committed by GitHub
parent 96fd31b762
commit 39aef524ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
patches/api/0413-Add-Tick-TemporalUnit.patch
View File

@ -6,16 +6,17 @@ Subject: [PATCH] Add Tick TemporalUnit
diff --git a/src/main/java/io/papermc/paper/util/Tick.java b/src/main/java/io/papermc/paper/util/Tick.java diff --git a/src/main/java/io/papermc/paper/util/Tick.java b/src/main/java/io/papermc/paper/util/Tick.java
new file mode 100644 new file mode 100644
index 0000000000000000000000000000000000000000..900f39c0c5c6f4f2c89e0b4dade0d26b367c4f57 index 0000000000000000000000000000000000000000..10430f02e1d1e654383154c04473f07469bc7fee
--- /dev/null --- /dev/null
+++ b/src/main/java/io/papermc/paper/util/Tick.java +++ b/src/main/java/io/papermc/paper/util/Tick.java
@@ -0,0 +1,94 @@ @@ -0,0 +1,95 @@
+package io.papermc.paper.util; +package io.papermc.paper.util;
+ +
+import net.kyori.adventure.util.Ticks; +import net.kyori.adventure.util.Ticks;
+import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.NotNull;
+ +
+import java.time.Duration; +import java.time.Duration;
+import java.time.temporal.ChronoUnit;
+import java.time.temporal.Temporal; +import java.time.temporal.Temporal;
+import java.time.temporal.TemporalUnit; +import java.time.temporal.TemporalUnit;
+import java.util.Objects; +import java.util.Objects;
@ -68,7 +69,7 @@ index 0000000000000000000000000000000000000000..900f39c0c5c6f4f2c89e0b4dade0d26b
+ */ + */
+ public int fromDuration(@NotNull Duration duration) { + public int fromDuration(@NotNull Duration duration) {
+ Objects.requireNonNull(duration, "duration cannot be null"); + Objects.requireNonNull(duration, "duration cannot be null");
+ return Math.toIntExact(Math.floorDiv(duration.toMillis(), INSTANCE.milliseconds)); + return Math.toIntExact(Math.floorDiv(duration.toMillis(), this.milliseconds));
+ } + }
+ +
+ @Override + @Override
@ -96,23 +97,26 @@ index 0000000000000000000000000000000000000000..900f39c0c5c6f4f2c89e0b4dade0d26b
+ @SuppressWarnings("unchecked") // following ChronoUnit#addTo + @SuppressWarnings("unchecked") // following ChronoUnit#addTo
+ @Override + @Override
+ public <R extends Temporal> @NotNull R addTo(@NotNull R temporal, long amount) { + public <R extends Temporal> @NotNull R addTo(@NotNull R temporal, long amount) {
+ return (R) temporal.plus(amount, this); + return (R) temporal.plus(getDuration().multipliedBy(amount));
+ } + }
+ +
+ @Override + @Override
+ public long between(@NotNull Temporal start, @NotNull Temporal end) { + public long between(@NotNull Temporal start, @NotNull Temporal end) {
+ return start.until(end, this); + return start.until(end, ChronoUnit.MILLIS) / this.milliseconds;
+ } + }
+} +}
diff --git a/src/test/java/io/papermc/paper/util/TickTest.java b/src/test/java/io/papermc/paper/util/TickTest.java diff --git a/src/test/java/io/papermc/paper/util/TickTest.java b/src/test/java/io/papermc/paper/util/TickTest.java
new file mode 100644 new file mode 100644
index 0000000000000000000000000000000000000000..9a48f7a82636d4047a3f5fefe69bb88c2f5aaaef index 0000000000000000000000000000000000000000..6d6d0564e07c0886648000490337272e1740ea21
--- /dev/null --- /dev/null
+++ b/src/test/java/io/papermc/paper/util/TickTest.java +++ b/src/test/java/io/papermc/paper/util/TickTest.java
@@ -0,0 +1,23 @@ @@ -0,0 +1,44 @@
+package io.papermc.paper.util; +package io.papermc.paper.util;
+ +
+import java.time.Duration; +import java.time.Duration;
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
+
+import org.junit.Test; +import org.junit.Test;
+ +
+import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertEquals;
@ -132,4 +136,22 @@ index 0000000000000000000000000000000000000000..9a48f7a82636d4047a3f5fefe69bb88c
+ assertEquals(1, Tick.tick().fromDuration(Duration.ofMillis(60))); + assertEquals(1, Tick.tick().fromDuration(Duration.ofMillis(60)));
+ assertEquals(2, Tick.tick().fromDuration(Duration.ofMillis(100))); + assertEquals(2, Tick.tick().fromDuration(Duration.ofMillis(100)));
+ } + }
+
+ @Test
+ public void testAddTickToInstant() {
+ Instant now = Instant.now();
+ assertEquals(now, now.plus(0, Tick.tick()));
+ assertEquals(now.plus(50, ChronoUnit.MILLIS), now.plus(1, Tick.tick()));
+ assertEquals(now.plus(100, ChronoUnit.MILLIS), now.plus(2, Tick.tick()));
+ assertEquals(now.plus(150, ChronoUnit.MILLIS), now.plus(3, Tick.tick()));
+ }
+
+ @Test
+ public void testTicksBetweenInstants() {
+ Instant now = Instant.now();
+ assertEquals(0, now.until(now.plus(20, ChronoUnit.MILLIS), Tick.tick()));
+ assertEquals(1, now.until(now.plus(50, ChronoUnit.MILLIS), Tick.tick()));
+ assertEquals(1, now.until(now.plus(60, ChronoUnit.MILLIS), Tick.tick()));
+ assertEquals(2, now.until(now.plus(100, ChronoUnit.MILLIS), Tick.tick()));
+ }
+} +}