diff --git a/modules/Movecraft/pom.xml b/modules/Movecraft/pom.xml index 74857c2cb..5afb48fc6 100644 --- a/modules/Movecraft/pom.xml +++ b/modules/Movecraft/pom.xml @@ -10,7 +10,7 @@ UTF-8 - 7.0.0_for_1.8.8-1.16.2_beta_36 + 7.0.0_for_1.8.8-1.16.2_beta_37 diff --git a/modules/Movecraft/src/main/java/net/countercraft/movecraft/async/AsyncManager.java b/modules/Movecraft/src/main/java/net/countercraft/movecraft/async/AsyncManager.java index a391cb894..be12575b2 100644 --- a/modules/Movecraft/src/main/java/net/countercraft/movecraft/async/AsyncManager.java +++ b/modules/Movecraft/src/main/java/net/countercraft/movecraft/async/AsyncManager.java @@ -17,12 +17,10 @@ package net.countercraft.movecraft.async; -import at.pavlov.cannons.cannon.Cannon; import com.google.common.collect.Lists; import net.countercraft.movecraft.Movecraft; import net.countercraft.movecraft.MovecraftBlock; import net.countercraft.movecraft.MovecraftLocation; -import net.countercraft.movecraft.Rotation; import net.countercraft.movecraft.async.detection.DetectionTask; import net.countercraft.movecraft.async.rotation.RotationTask; import net.countercraft.movecraft.async.translation.TranslationTask; @@ -43,7 +41,6 @@ import org.bukkit.entity.SmallFireball; import org.bukkit.entity.TNTPrimed; import org.bukkit.scheduler.BukkitRunnable; -import org.bukkit.util.Vector; import org.jetbrains.annotations.NotNull; import java.util.*; diff --git a/modules/Movecraft/src/main/java/net/countercraft/movecraft/utils/CannonsUtils.java b/modules/Movecraft/src/main/java/net/countercraft/movecraft/utils/CannonsUtils.java deleted file mode 100644 index a51396a0e..000000000 --- a/modules/Movecraft/src/main/java/net/countercraft/movecraft/utils/CannonsUtils.java +++ /dev/null @@ -1,30 +0,0 @@ -package net.countercraft.movecraft.utils; - -import at.pavlov.cannons.API.CannonsAPI; -import at.pavlov.cannons.cannon.Cannon; -import net.countercraft.movecraft.craft.Craft; -import org.bukkit.Location; -import org.bukkit.World; - -import java.util.HashSet; -import java.util.Set; - -public class CannonsUtils { - public static Set getCannonsInHitBox(HitBox hitBox, World world) { - Set foundCannons = new HashSet<>(); - for (Cannon can : CannonsAPI.getCannonsInBox(hitBox.getMidPoint().toBukkit(world), hitBox.getXLength(), hitBox.getYLength(), hitBox.getZLength())) { - for (Location barrelLoc : can.getCannonDesign().getBarrelBlocks(can)) { - if (!hitBox.contains(MathUtils.bukkit2MovecraftLoc(barrelLoc))) { - continue; - } - foundCannons.add(can); - break; - } - } - return foundCannons; - } - - public static Set getCannonsOnCraft(Craft c) { - return getCannonsInHitBox(c.getHitBox(), c.getWorld()); - } -}