Add options to disable spawning of tnt (#132)

APDevTeam · Jul 25, 2024 · 6cdc6c4 · 6cdc6c4
1 parent 4a14bb6
commit 6cdc6c4
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/src/main/java/net/countercraft/movecraft/combat/features/tracking/DamageTracking.java b/src/main/java/net/countercraft/movecraft/combat/features/tracking/DamageTracking.java
@@ -24,13 +24,17 @@ public class DamageTracking implements Listener {
     public static boolean EnableFireballTracking = false;
     public static boolean EnableTNTTracking = true;
     public static boolean EnableTorpedoTracking = false;
+    public static boolean DisableSinkingCraftTNT = true;
+    public static boolean DisableDisabledCraftTNT = false;
     public static int DamageTimeout = 300;
     private final Map<PlayerCraft, List<DamageRecord>> damageRecords = new HashMap<>();
 
     public static void load(@NotNull FileConfiguration config) {
         EnableFireballTracking = config.getBoolean("EnableFireballTracking", false);
         EnableTNTTracking = config.getBoolean("EnableTNTTracking", true);
         EnableTorpedoTracking = config.getBoolean("EnableTorpedoTracking", false);
+        DisableSinkingCraftTNT = config.getBoolean("DisableSinkingCraftTNT", true);
+        DisableDisabledCraftTNT = config.getBoolean("DisableDisabledCraftTNT", false);
         DamageTimeout = config.getInt("DamageTimeout", 300);
     }
 

diff --git a/src/main/java/net/countercraft/movecraft/combat/features/tracking/TNTTracking.java b/src/main/java/net/countercraft/movecraft/combat/features/tracking/TNTTracking.java
@@ -9,6 +9,7 @@
 import net.countercraft.movecraft.craft.Craft;
 import net.countercraft.movecraft.craft.CraftManager;
 import net.countercraft.movecraft.craft.PlayerCraft;
+import net.countercraft.movecraft.craft.SinkingCraft;
 import net.countercraft.movecraft.util.MathUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
@@ -81,16 +82,25 @@ private Vector getTNTVector() {
     }
 
     @EventHandler
-    public void onEntitySpawn (@NotNull EntitySpawnEvent e) {
+    public void onEntitySpawn(@NotNull EntitySpawnEvent e) {
         if (!DamageTracking.EnableTNTTracking)
             return;
-        if(!e.getEntityType().equals(EntityType.PRIMED_TNT))
+        if (!e.getEntityType().equals(EntityType.PRIMED_TNT))
             return;
-        TNTPrimed tnt = (TNTPrimed)e.getEntity();
+        TNTPrimed tnt = (TNTPrimed) e.getEntity();
 
         // Find nearest craft
         Craft craft = MathUtils.fastNearestCraftToLoc(CraftManager.getInstance().getCrafts(),
                 tnt.getLocation());
+        if (craft instanceof SinkingCraft && DamageTracking.DisableSinkingCraftTNT) {
+            e.setCancelled(true);
+            return;
+        }
+        else if (craft != null && craft.getDisabled() && DamageTracking.DisableDisabledCraftTNT) {
+            e.setCancelled(true);
+            return;
+        }
+
         if (!(craft instanceof PlayerCraft))
             return;
         if (!craft.getHitBox().contains(MathUtils.bukkit2MovecraftLoc(tnt.getLocation()))) {

diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
@@ -58,6 +58,8 @@ ExplosionParticles: VILLAGER_ANGRY # Particle to use for particle tracer explosi
 EnableFireballTracking: false # Enable tracking and recording of fireballs (higher lag than other tracking methods)
 EnableTNTTracking: false # Enable tracking and recording of TNT damage
 EnableTorpedoTracking: false # Enable tracking and recording of Torpedo damage
+DisableSinkingCraftTNT: true # Disable spawning of TNT from sinking crafts
+DisableDisabledCraftTNT: false # Disable spawning of TNT from disabled crafts
 DamageTimeout: 300 # Timeout for damages in seconds
 
 # Combat Release Tracking