Fix tnt jump being random

Author: boiscljo

plugin/src/main/java/io/github/pronze/sba/config/SBAConfig.java

@@ -120,7 +120,7 @@ public void loadDefaults() {
                     .key("permanent-items").defValue(false)
                     .section("tnt-fireball-jumping")
                     .key("source-damage").defValue(1)
-                    .key("acceleration-y").defValue(0.8)
+                    .key("acceleration-y").defValue(0.1)
                     .key("reduce-y").defValue(2.0)
                     .key("launch-multiplier").defValue(3.4)
                     .key("detection-distance").defValue(8.0D)

plugin/src/main/java/io/github/pronze/sba/listener/ExplosionVelocityControlListener.java

@@ -61,8 +61,12 @@ private void endTntJump(Player player) {
     }
 
     @EventHandler(priority = EventPriority.LOWEST)
-    public void onExplode(EntityDamageByEntityEvent event) {
-        final var explodedEntity = event.getDamager();
+    public void onExplode(EntityExplodeEvent event) {
+        final var explodedEntity = event.getEntity();
+        // }
+        // @EventHandler(priority = EventPriority.LOWEST)
+        // public void onExplode(EntityDamageByEntityEvent event) {
+        // final var explodedEntity = event.getDamager();
 
         if (explodedEntity instanceof Explosive) {
             final var detectionDistance = SBAConfig.getInstance().node("tnt-fireball-jumping", "detection-distance")
@@ -74,27 +78,42 @@ public void onExplode(EntityDamageByEntityEvent event) {
                     .stream()
                     .filter(entity -> !entity.equals(explodedEntity))
                     .forEach(entity -> {
-                        Vector vector = explodedEntity
+                        Vector vector = entity
                                 .getLocation()
                                 .clone()
-                                .add(0, SBAConfig.getInstance().node("tnt-fireball-jumping", "acceleration-y")
-                                        .getDouble(1.0), 0)
                                 .toVector()
-                                .subtract(explodedEntity.getLocation().toVector()).normalize();
+                                .subtract(explodedEntity.getLocation().clone()
+                                        .add(0, SBAConfig.getInstance().node("tnt-fireball-jumping",
+                                                "acceleration-y")
+                                                .getDouble(1.0), 0)
+                                        .toVector())
+                                .normalize();
+                        Logger.trace("{}", vector);
                         vector.setY(vector.getY()
                                 / SBAConfig.getInstance().node("tnt-fireball-jumping", "reduce-y").getDouble(2.0));
+                        if (!Double.isFinite(vector.getY())) {
+                            vector.setY(0);
+                        }
+                        if (!Double.isFinite(vector.getX())) {
+                            vector.setX(0);
+                        }
+                        if (!Double.isFinite(vector.getZ())) {
+                            vector.setZ(0);
+                        }
                         vector.multiply(SBAConfig.getInstance().node("tnt-fireball-jumping", "launch-multiplier")
                                 .getDouble(4.0));
 
                         if (entity instanceof Player) {
                             final var player = (Player) entity;
-                            if (player.getGameMode() == GameMode.SPECTATOR || !Main.isPlayerInGame(player)) {
-                                return;
+                            if (player.getGameMode() == GameMode.SPECTATOR ||
+                             !Main.isPlayerInGame(player)) {
+                             return;
                             }
-                            vector.add(new Vector(player.getEyeLocation().getDirection().getX(), 0,
-                                    player.getEyeLocation().getDirection().getZ()));
+                            // vector.add(new Vector(player.getEyeLocation().getDirection().getX(), 0,
+                            // player.getEyeLocation().getDirection().getZ()));
+
                             AntiCheatIntegration.getInstance().beginTntJump(player);
-                            player.setVelocity(vector);
+                            player.setVelocity(vector.add(player.getVelocity()));
                             explosionAffectedPlayers.put(player, startTask(player));
                             return;
                         }

plugin/src/main/java/io/github/pronze/sba/utils/ShopUtil.java

@@ -398,7 +398,7 @@ public static String getNameOrCustomNameOfItem(Item item) {
     public static void addEnchantsToPlayerArmor(Player player, int newLevel) {
         for (var item : player.getInventory().getArmorContents()) {
             if (item != null) {
-                item.addEnchantment(Enchantment.PROTECTION_ENVIRONMENTAL, newLevel);
+                applyTeamEnchants(player, item);
             }
         }
     }
@@ -541,16 +541,7 @@ public static void applyTeamUpgrades(@NotNull Player player, Game game) {
         Arrays.stream(player.getInventory().getContents())
                 .filter(Objects::nonNull)
                 .forEach(item -> {
-                    if (finalTeamSharpnessLevel > 0)
-                        if (item.getType().name().endsWith("SWORD")) {
-                            item.addEnchantment(Enchantment.DAMAGE_ALL,
-                                    finalTeamSharpnessLevel);
-                        }
-                    if (finalTeamEfficiencyLevel > 0)
-                        if (item.getType().name().endsWith("PICKAXE")) {
-                            item.addEnchantment(Enchantment.DIG_SPEED,
-                                    finalTeamEfficiencyLevel);
-                        }
+                    applyTeamEnchants(player, item);
                 });
     }