feat: TNT minecart tracking

This commit introduces TNT minecart tracking into PGM, spawned into the world using dispensers or players (tracking player-placed TNT minecarts requires a patched version of SportPaper). This change also allows destroyables (cores and monuments) to be destroyed using TNT minecarts. Fixes #1176. Signed-off-by: TTtie <[email protected]>
PGMDev · Jan 17, 2024 · cc5ebcc · cc5ebcc
1 parent 682f968
commit cc5ebcc
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 17 deletions.
diff --git a/core/src/main/java/tc/oc/pgm/core/CoreMatchModule.java b/core/src/main/java/tc/oc/pgm/core/CoreMatchModule.java
@@ -7,15 +7,13 @@
 import java.util.concurrent.TimeUnit;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
-import org.bukkit.entity.minecart.ExplosiveMinecart;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.BlockDamageEvent;
 import org.bukkit.event.block.BlockDispenseEvent;
 import org.bukkit.event.block.BlockPistonExtendEvent;
 import org.bukkit.event.block.BlockPistonRetractEvent;
-import org.bukkit.event.entity.EntityExplodeEvent;
 import org.bukkit.util.Vector;
 import tc.oc.pgm.api.event.BlockTransformEvent;
 import tc.oc.pgm.api.match.Match;
@@ -108,12 +106,6 @@ public void breakCheck(final BlockTransformEvent event) {
                 this.match.callEvent(new GoalStatusChangeEvent(this.match, core));
               }
             }
-          } else if (event.getCause() instanceof EntityExplodeEvent) {
-            // this is a temp fix until there is a tracker for placed minecarts (only dispensed are
-            // tracked right now)
-            if (((EntityExplodeEvent) event.getCause()).getEntity() instanceof ExplosiveMinecart) {
-              event.setCancelled(true);
-            }
           } else if (event.getCause() instanceof BlockPistonRetractEvent) {
             event.setCancelled(true);
           }

diff --git a/core/src/main/java/tc/oc/pgm/destroyable/DestroyableMatchModule.java b/core/src/main/java/tc/oc/pgm/destroyable/DestroyableMatchModule.java
@@ -4,14 +4,12 @@
 
 import java.util.Collection;
 import org.bukkit.block.Block;
-import org.bukkit.entity.minecart.ExplosiveMinecart;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.BlockDamageEvent;
 import org.bukkit.event.block.BlockPistonExtendEvent;
 import org.bukkit.event.block.BlockPistonRetractEvent;
-import org.bukkit.event.entity.EntityExplodeEvent;
 import org.bukkit.material.MaterialData;
 import tc.oc.pgm.api.event.BlockTransformEvent;
 import tc.oc.pgm.api.match.Match;
@@ -57,11 +55,7 @@ public void testBlockChange(BlockTransformEvent event) {
       return;
     }
 
-    // This is a temp fix until there is a tracker for placed minecarts (only dispensed are tracked
-    // right now)
-    if ((event.getCause() instanceof EntityExplodeEvent
-            && ((EntityExplodeEvent) event.getCause()).getEntity() instanceof ExplosiveMinecart)
-        || event.getCause() instanceof BlockPistonExtendEvent
+    if (event.getCause() instanceof BlockPistonExtendEvent
         || event.getCause() instanceof BlockPistonRetractEvent) {
 
       event.setCancelled(true);

diff --git a/core/src/main/java/tc/oc/pgm/tracker/trackers/TNTTracker.java b/core/src/main/java/tc/oc/pgm/tracker/trackers/TNTTracker.java
@@ -3,16 +3,19 @@
 import org.bukkit.Material;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.TNTPrimed;
+import org.bukkit.entity.minecart.ExplosiveMinecart;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.entity.ExplosionPrimeEvent;
 import tc.oc.pgm.api.match.Match;
 import tc.oc.pgm.api.player.ParticipantState;
 import tc.oc.pgm.events.ParticipantBlockTransformEvent;
 import tc.oc.pgm.tracker.TrackerMatchModule;
+import tc.oc.pgm.tracker.info.EntityInfo;
 import tc.oc.pgm.tracker.info.TNTInfo;
 import tc.oc.pgm.util.event.block.BlockDispenseEntityEvent;
 import tc.oc.pgm.util.event.entity.ExplosionPrimeByEntityEvent;
+import tc.oc.pgm.util.event.player.PlayerSpawnEntityEvent;
 
 /** Updates the state of owned TNT blocks and entities */
 public class TNTTracker extends AbstractTracker<TNTInfo> {
@@ -70,12 +73,25 @@ public void onPrime(ExplosionPrimeEvent event) {
 
   @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
   public void onDispense(BlockDispenseEntityEvent event) {
-    if (event.getEntity() instanceof TNTPrimed) {
+    if ((event.getEntity() instanceof TNTPrimed)
+        || (event.getEntity() instanceof ExplosiveMinecart)) {
       ParticipantState owner = blocks().getOwner(event.getBlock());
       if (owner != null) {
         entities()
-            .trackEntity(event.getEntity(), new TNTInfo(owner, event.getEntity().getLocation()));
+            .trackEntity(
+                event.getEntity(),
+                (event.getEntity() instanceof TNTPrimed)
+                    ? new TNTInfo(owner, event.getEntity().getLocation())
+                    : new EntityInfo(event.getEntity(), owner));
       }
     }
   }
+
+  @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+  public void onSpawn(PlayerSpawnEntityEvent event) {
+    ParticipantState owner = match.getParticipantState(event.getPlayer());
+    if (event.getEntity() instanceof ExplosiveMinecart && owner != null) {
+      entities().trackEntity(event.getEntity(), new EntityInfo(event.getEntity(), owner));
+    }
+  }
 }