Add yield attribute for projectiles

Signed-off-by: Christopher White <[email protected]>
PGMDev · Sep 10, 2023 · 13c6dbb · 13c6dbb
1 parent 09052d0
commit 13c6dbb
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/core/src/main/java/tc/oc/pgm/projectile/ProjectileDefinition.java b/core/src/main/java/tc/oc/pgm/projectile/ProjectileDefinition.java
@@ -11,6 +11,7 @@
 public class ProjectileDefinition extends SelfIdentifyingFeatureDefinition {
   protected @Nullable String name;
   protected @Nullable Double damage;
+  protected @Nullable Float power;
   protected double velocity;
   protected ClickAction clickAction;
   protected Class<? extends Entity> projectile;
@@ -24,6 +25,7 @@ public ProjectileDefinition(
       @Nullable String id,
       @Nullable String name,
       @Nullable Double damage,
+      @Nullable Float power,
       double velocity,
       ClickAction clickAction,
       Class<? extends Entity> entity,
@@ -35,6 +37,7 @@ public ProjectileDefinition(
     super(id);
     this.name = name;
     this.damage = damage;
+    this.power = power;
     this.velocity = velocity;
     this.clickAction = clickAction;
     this.projectile = entity;

diff --git a/core/src/main/java/tc/oc/pgm/projectile/ProjectileMatchModule.java b/core/src/main/java/tc/oc/pgm/projectile/ProjectileMatchModule.java
@@ -8,6 +8,7 @@
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Entity;
+import org.bukkit.entity.Explosive;
 import org.bukkit.entity.Fireball;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
@@ -105,6 +106,9 @@ && isValidProjectileAction(event.getAction(), projectileDefinition.clickAction))
               player.getWorld().spawn(player.getEyeLocation(), projectileDefinition.projectile);
           projectile.setVelocity(velocity);
         }
+        if (projectileDefinition.power != null && projectile instanceof Explosive) {
+          ((Explosive) projectile).setYield(projectileDefinition.power);
+        }
         projectile.setMetadata(
             "projectileDefinition", new FixedMetadataValue(PGM.get(), projectileDefinition));
       } finally {

diff --git a/core/src/main/java/tc/oc/pgm/projectile/ProjectileModule.java b/core/src/main/java/tc/oc/pgm/projectile/ProjectileModule.java
@@ -65,6 +65,9 @@ public ProjectileModule parse(MapFactory factory, Logger logger, Document doc)
                 Node.fromAttr(projectileElement, "click"), ClickAction.class, ClickAction.BOTH);
         Class<? extends Entity> entity =
             XMLUtils.parseEntityTypeAttribute(projectileElement, "projectile", Arrow.class);
+        Float power =
+            XMLUtils.parseNumber(
+                Node.fromChildOrAttr(projectileElement, "power"), Float.class, (Float) null);
         List<PotionEffect> potionKit = kitParser.parsePotions(projectileElement);
         Filter destroyFilter =
             filterParser.parseFilterProperty(projectileElement, "destroy-filter");
@@ -78,6 +81,7 @@ public ProjectileModule parse(MapFactory factory, Logger logger, Document doc)
                 id,
                 name,
                 damage,
+                power,
                 velocity,
                 clickAction,
                 entity,