From c28bd0941335f207a323ca4b1fe429a8eb9871eb Mon Sep 17 00:00:00 2001 From: Shane Bee Date: Wed, 1 May 2024 13:17:48 -0700 Subject: [PATCH] Add (some) 1.20.5 entities (#6632) --- src/main/java/ch/njol/skript/entity/SimpleEntityData.java | 7 +++++++ src/main/resources/lang/default.lang | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/src/main/java/ch/njol/skript/entity/SimpleEntityData.java b/src/main/java/ch/njol/skript/entity/SimpleEntityData.java index b63388d87db..93c690d6926 100644 --- a/src/main/java/ch/njol/skript/entity/SimpleEntityData.java +++ b/src/main/java/ch/njol/skript/entity/SimpleEntityData.java @@ -27,11 +27,13 @@ import org.bukkit.entity.Allay; import org.bukkit.entity.Animals; import org.bukkit.entity.AreaEffectCloud; +import org.bukkit.entity.Armadillo; import org.bukkit.entity.ArmorStand; import org.bukkit.entity.Arrow; import org.bukkit.entity.Bat; import org.bukkit.entity.Blaze; import org.bukkit.entity.BlockDisplay; +import org.bukkit.entity.Bogged; import org.bukkit.entity.Breeze; import org.bukkit.entity.Camel; import org.bukkit.entity.CaveSpider; @@ -317,6 +319,11 @@ private static void addSuperEntity(String codeName, Class enti addSimpleEntity("wind charge", WindCharge.class); } + if (Skript.isRunningMinecraft(1,20,5)) { + addSimpleEntity("armadillo", Armadillo.class); + addSimpleEntity("bogged", Bogged.class); + } + // Register zombie after Husk and Drowned to make sure both work addSimpleEntity("zombie", Zombie.class); // Register squid after glow squid to make sure both work diff --git a/src/main/resources/lang/default.lang b/src/main/resources/lang/default.lang index aa529adb33d..21bfe5f6092 100644 --- a/src/main/resources/lang/default.lang +++ b/src/main/resources/lang/default.lang @@ -1260,6 +1260,13 @@ entities: wind charge: name: wind charge¦s pattern: wind charge(|1¦s) + # 1.20.5 Entities + armadillo: + name: armadillo¦s @an + pattern: armadillo(|1¦s)|(4¦)armadillo (kid(|1¦s)|child(|1¦ren)) + bogged: + name: bogged + pattern: bogged # -- Heal Reasons -- heal reasons: