Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2024-06-27 06:54:57 +02:00
Code Issues Projects Releases Wiki Activity

Only predict projectile higher if there is gravity (#1016)

Browse Source
This commit is contained in:
Kiip 2022-05-06 20:55:31 +02:00 committed by GitHub
parent cef824bc16
commit 35ae8bc07a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 78 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/net/minestom/server/entity/EntityProjectile.java
View File

@ -63,8 +63,10 @@ public class EntityProjectile extends Entity {
double dx = to.x() - from.x();
double dy = to.y() - from.y();
double dz = to.z() - from.z();
final double xzLength = Math.sqrt(dx * dx + dz * dz);
dy += xzLength * 0.20000000298023224D;
if (!hasNoGravity()) {
final double xzLength = Math.sqrt(dx * dx + dz * dz);
dy += xzLength * 0.20000000298023224D;
}
final double length = Math.sqrt(dx * dx + dy * dy + dz * dz);
dx /= length;

74
src/test/java/net/minestom/server/entity/EntityProjectileIntegrationTest.java Normal file
View File

@ -0,0 +1,74 @@
package net.minestom.server.entity;
import net.minestom.server.api.Env;
import net.minestom.server.api.EnvTest;
import net.minestom.server.coordinate.Pos;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
@EnvTest
public class EntityProjectileIntegrationTest {
@Test
public void gravityVelocity(Env env) {
var instance = env.createFlatInstance();
var shooter = new EntityCreature(EntityType.SKELETON);
shooter.setInstance(instance, new Pos(0, 42, 0)).join();
var projectile = new EntityProjectile(shooter, EntityType.ARROW);
var from = new Pos(0, 42, 0).add(0,
shooter.getEyeHeight(), shooter.getPosition().direction().z());
var target = from.add(0, 0, 10);
projectile.setInstance(instance, from).join();
projectile.shoot(target, 1, 0);
var before = projectile.getPosition(); // at start
var after = projectile.getPosition(); // now - 1 tick, closest to target
var smallestDistance = 1e6;
while (true) {
final var distance = projectile.getPosition().distanceSquared(target);
if (distance <= smallestDistance) smallestDistance = distance;
else break;
after = projectile.getPosition();
env.tick();
}
// Ensure the position is correct.
// x doesn't change
// Big delta because ticks aren't very accurate
assertEquals(before.x(), after.x());
assertEquals(target.y(), after.y(), 0.6);
assertEquals(target.z(), after.z(), 0.6);
}
@Test
public void noGravityVelocity(Env env) {
var instance = env.createFlatInstance();
var shooter = new EntityCreature(EntityType.SKELETON);
shooter.setInstance(instance, new Pos(0, 42, 0)).join();
var projectile = new EntityProjectile(shooter, EntityType.ARROW);
var from = new Pos(0, 42, 0).add(0,
shooter.getEyeHeight(), shooter.getPosition().direction().z());
var target = from.add(0, 0, 10);
projectile.setNoGravity(true);
projectile.setInstance(instance, from).join();
projectile.shoot(target, 1, 0);
var before = projectile.getPosition(); // at start
var after = projectile.getPosition(); // now - 1 tick, closest to target
var smallestDistance = 1e6;
while (true) {
final var distance = projectile.getPosition().distanceSquared(target);
if (distance <= smallestDistance) smallestDistance = distance;
else break;
after = projectile.getPosition();
env.tick();
}
// x and y don't change (no gravity) and z changes by Σz velocity.
assertEquals(before.x(), after.x());
assertEquals(before.y(), after.y());
assertEquals(target.z(), after.z(), 0.05);
}
}