From 8e1e22cf66167fec06771f25a9e5d86ec808c77a Mon Sep 17 00:00:00 2001 From: DeeCaaD Date: Thu, 6 Jan 2022 00:15:25 +0200 Subject: [PATCH] Quick fix to remove on block collision projectile --- .../weapon/projectile/RemoveOnBlockCollisionProjectile.java | 3 +++ .../resources/WeaponMechanics/weapons/explosives/Airstrike.yml | 0 .../WeaponMechanics/weapons/explosives/Cluster_Bomb.yml | 0 .../resources/WeaponMechanics/weapons/explosives/Flashbang.yml | 0 4 files changed, 3 insertions(+) create mode 100644 WeaponMechanics/src/main/resources/WeaponMechanics/weapons/explosives/Airstrike.yml create mode 100644 WeaponMechanics/src/main/resources/WeaponMechanics/weapons/explosives/Cluster_Bomb.yml create mode 100644 WeaponMechanics/src/main/resources/WeaponMechanics/weapons/explosives/Flashbang.yml diff --git a/WeaponMechanics/src/main/java/me/deecaad/weaponmechanics/weapon/projectile/RemoveOnBlockCollisionProjectile.java b/WeaponMechanics/src/main/java/me/deecaad/weaponmechanics/weapon/projectile/RemoveOnBlockCollisionProjectile.java index 2ab341116..ebd774371 100644 --- a/WeaponMechanics/src/main/java/me/deecaad/weaponmechanics/weapon/projectile/RemoveOnBlockCollisionProjectile.java +++ b/WeaponMechanics/src/main/java/me/deecaad/weaponmechanics/weapon/projectile/RemoveOnBlockCollisionProjectile.java @@ -28,6 +28,7 @@ public RemoveOnBlockCollisionProjectile(Location location, Vector motion, FakeEn @Override public boolean handleCollisions(boolean disableEntityCollisions) { + Vector possibleNextLocation = getLocation().add(getMotion()); double distance = Math.ceil(getMotionLength()); // If distance is 0 or below, it will cause issues @@ -48,6 +49,8 @@ public boolean handleCollisions(boolean disableEntityCollisions) { return true; } + setRawLocation(possibleNextLocation); + // There wasn't any collisions return false; } diff --git a/WeaponMechanics/src/main/resources/WeaponMechanics/weapons/explosives/Airstrike.yml b/WeaponMechanics/src/main/resources/WeaponMechanics/weapons/explosives/Airstrike.yml new file mode 100644 index 000000000..e69de29bb diff --git a/WeaponMechanics/src/main/resources/WeaponMechanics/weapons/explosives/Cluster_Bomb.yml b/WeaponMechanics/src/main/resources/WeaponMechanics/weapons/explosives/Cluster_Bomb.yml new file mode 100644 index 000000000..e69de29bb diff --git a/WeaponMechanics/src/main/resources/WeaponMechanics/weapons/explosives/Flashbang.yml b/WeaponMechanics/src/main/resources/WeaponMechanics/weapons/explosives/Flashbang.yml new file mode 100644 index 000000000..e69de29bb