Villager expression updates (#7352)

SkriptLang · Jan 1, 2025 · 9c6cae0 · 9c6cae0
1 parent bc9666e
commit 9c6cae0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/main/java/ch/njol/skript/expressions/ExprVillagerProfession.java b/src/main/java/ch/njol/skript/expressions/ExprVillagerProfession.java
@@ -10,11 +10,12 @@
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Villager;
 import org.bukkit.entity.Villager.Profession;
+import org.bukkit.entity.ZombieVillager;
 import org.bukkit.event.Event;
 import org.jetbrains.annotations.Nullable;
 
 @Name("Villager Profession")
-@Description("Represents the profession of a villager.")
+@Description("Represents the profession of a villager/zombie villager.")
 @Examples({
 	"set {_p} to villager profession of event-entity",
 	"villager profession of event-entity = nitwit profession",
@@ -32,6 +33,8 @@ public class ExprVillagerProfession extends SimplePropertyExpression<LivingEntit
 	public @Nullable Profession convert(LivingEntity from) {
 		if (from instanceof Villager villager)
 			return villager.getProfession();
+		else if (from instanceof ZombieVillager zombie)
+			return zombie.getVillagerProfession();
 		return null;
 	}
 
@@ -50,6 +53,8 @@ public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
 		for (LivingEntity livingEntity : getExpr().getArray(event)) {
 			if (livingEntity instanceof Villager villager)
 				villager.setProfession(profession);
+			else if (livingEntity instanceof ZombieVillager zombie)
+				zombie.setVillagerProfession(profession);
 		}
 	}
 

diff --git a/src/main/java/ch/njol/skript/expressions/ExprVillagerType.java b/src/main/java/ch/njol/skript/expressions/ExprVillagerType.java
@@ -10,11 +10,12 @@
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Villager;
 import org.bukkit.entity.Villager.Type;
+import org.bukkit.entity.ZombieVillager;
 import org.bukkit.event.Event;
 import org.jetbrains.annotations.Nullable;
 
 @Name("Villager Type")
-@Description("Represents the type of a villager. This usually represents the biome the villager is from.")
+@Description("Represents the type of a villager/zombie villager. This usually represents the biome the villager is from.")
 @Examples({
 	"set {_type} to villager type of {_villager}",
 	"villager type of {_villager} = plains",
@@ -31,6 +32,8 @@ public class ExprVillagerType extends SimplePropertyExpression<LivingEntity, Typ
 	public @Nullable Type convert(LivingEntity from) {
 		if (from instanceof Villager villager)
 			return villager.getVillagerType();
+		else if (from instanceof ZombieVillager zombie)
+			return zombie.getVillagerType();
 		return null;
 	}
 
@@ -50,6 +53,8 @@ public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
 		for (LivingEntity livingEntity : getExpr().getArray(event)) {
 			if (livingEntity instanceof Villager villager)
 				villager.setVillagerType(type);
+			else if (livingEntity instanceof ZombieVillager zombie)
+				zombie.setVillagerType(type);
 		}
 	}