ExprArmorSlot - Body Armor

src/main/java/ch/njol/skript/expressions/ExprArmorSlot.java

@@ -30,7 +30,9 @@
 import ch.njol.skript.util.slot.EquipmentSlot.EquipSlot;
 import ch.njol.skript.util.slot.Slot;
 import ch.njol.util.Kleenean;
+import org.bukkit.entity.AbstractHorse;
 import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Wolf;
 import org.bukkit.event.Event;
 import org.bukkit.inventory.EntityEquipment;
 import org.eclipse.jdt.annotation.Nullable;
@@ -50,19 +52,22 @@
 public class ExprArmorSlot extends PropertyExpression<LivingEntity, Slot> {
 
 	static {
-		register(ExprArmorSlot.class, Slot.class, "((boots:(boots|shoes)|leggings:leg[ging]s|chestplate:chestplate[s]|helmet:helmet[s]) [(item|:slot)]|armour:armo[u]r[s])", "livingentities");
+		register(ExprArmorSlot.class, Slot.class, "((boots:(boots|shoes)|leggings:leg[ging]s|chestplate:chestplate[s]|helmet:helmet[s]) [(item|:slot)]|armour:armo[u]r[s]|bodyarmor:body armo[u]r)", "livingentities");
 	}
 
 	@Nullable
 	private EquipSlot slot;
 	private boolean explicitSlot;
 	private boolean isArmor;
 
+	private boolean isBody;
+
 	@Override
 	@SuppressWarnings("unchecked")
 	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		isBody = parseResult.hasTag("bodyarmor");
 		isArmor = parseResult.hasTag("armour");
-		slot = isArmor ? null : EquipSlot.valueOf(parseResult.tags.get(0).toUpperCase(Locale.ENGLISH));
+		slot = (isArmor || isBody) ? null : EquipSlot.valueOf(parseResult.tags.get(0).toUpperCase(Locale.ENGLISH));
 		explicitSlot = parseResult.hasTag("slot"); // User explicitly asked for SLOT, not item
 		setExpr((Expression<? extends LivingEntity>) exprs[0]);
 		return true;
@@ -76,6 +81,13 @@ protected Slot[] get(Event event, LivingEntity[] source) {
 					.flatMap(equipment -> {
 						if (equipment == null)
 							return null;
+						if (isBody) {
+							if (!(equipment.getHolder() instanceof Wolf) && !(equipment.getHolder() instanceof AbstractHorse))
+								return null;
+							return Stream.of(
+								new EquipmentSlot(equipment, EquipSlot.BODY, explicitSlot)
+							);
+						}
 						return Stream.of(
 								new EquipmentSlot(equipment, EquipSlot.HELMET, explicitSlot),
 								new EquipmentSlot(equipment, EquipSlot.CHESTPLATE, explicitSlot),
@@ -96,7 +108,7 @@ protected Slot[] get(Event event, LivingEntity[] source) {
 
 	@Override
 	public boolean isSingle() {
-		return !isArmor && super.isSingle();
+		return isBody || (!isArmor && super.isSingle());
 	}
 
 	@Override

src/main/java/ch/njol/skript/util/slot/EquipmentSlot.java

@@ -110,6 +110,19 @@ public ItemStack get(final EntityEquipment e) {
 			public void set(final EntityEquipment e, final @Nullable ItemStack item) {
 				e.setBoots(item);
 			}
+		},
+
+		BODY() {
+			@Override
+			@Nullable
+			public ItemStack get(final EntityEquipment e) {
+				return e.getItem(org.bukkit.inventory.EquipmentSlot.BODY);
+			}
+
+			@Override
+			public void set(final EntityEquipment e, final @Nullable ItemStack item) {
+				e.setItem(org.bukkit.inventory.EquipmentSlot.BODY, item);
+			}
 		};
 
 		public final int slotNumber;

src/test/skript/tests/syntaxes/expressions/ExprArmorSlot.sk

@@ -12,3 +12,13 @@ test "armour slot":
 		clear armour of event-entity
 		assert armour of event-entity does not contain dirt block, diamond chestplate, iron leggings and gold boots with "Failed to clear EquipmentSlots"
 		delete event-entity
+
+test "body armor wolf" when running minecraft "1.20.5":
+	spawn wolf at spawn of world "world":
+		set {_entity} to event-entity
+
+	set body armor of {_entity} to wolf armor
+	assert body armor of {_entity} is wolf armor with "Body armor of entity is not wolf armor"
+	clear body armor of {_entity}
+	assert body armor of {_entity} is air with "Body armor of entity did not get cleared"
+	clear entity within {_entity}