Upstream
/
Minestom
mirror of https://github.com/Minestom/Minestom.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix worldborder size on resize + test (#937)

This commit is contained in:
iam 2022-04-17 13:54:41 -04:00 committed by GitHub
parent 6aa999aa77
commit 0d93faf0db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 39 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/net/minestom/server/instance/WorldBorder.java
View File

@ -210,14 +210,15 @@ public class WorldBorder {
double diameterDelta = newDiameter - oldDiameter;
long elapsedTime = System.currentTimeMillis() - lerpStartTime;
double percentage = (double) elapsedTime / (double) speed;
percentage = Math.max(percentage, 1);
this.currentDiameter = oldDiameter + (diameterDelta * percentage);
// World border finished lerp
if (percentage == 1) {
if (percentage > 0.99) {
this.lerpStartTime = 0;
this.speed = 0;
this.oldDiameter = newDiameter;
this.currentDiameter = newDiameter;
} else {
this.currentDiameter = oldDiameter + (diameterDelta * percentage);
}
}
}

35
src/test/java/net/minestom/server/instance/WorldBorderIntegrationTest.java Normal file
View File

@ -0,0 +1,35 @@
package net.minestom.server.instance;
import net.minestom.server.api.Env;
import net.minestom.server.api.EnvTest;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
@EnvTest
public class WorldBorderIntegrationTest {
@Test
public void setWorldborderSize(Env env) {
Instance instance = env.createFlatInstance();
instance.getWorldBorder().setDiameter(50.0);
assertEquals(50.0, instance.getWorldBorder().getDiameter());
instance.getWorldBorder().setDiameter(10.0);
assertEquals(10.0, instance.getWorldBorder().getDiameter());
}
@Test
public void resizeWorldBorder(Env env) throws InterruptedException {
Instance instance = env.createFlatInstance();
instance.getWorldBorder().setDiameter(50.0);
instance.getWorldBorder().setDiameter(10.0, 1);
assertEquals(50.0, instance.getWorldBorder().getDiameter());
Thread.sleep(10);
instance.getWorldBorder().update();
assertEquals(10.0, instance.getWorldBorder().getDiameter());
}
}