Add has_scoreboard_tag()

EngineHub · Nov 11, 2024 · 5c98e12 · 5c98e12
1 parent 4259442
commit 5c98e12
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 0 deletions.
diff --git a/src/main/java/com/laytonsmith/abstraction/MCEntity.java b/src/main/java/com/laytonsmith/abstraction/MCEntity.java
@@ -99,6 +99,8 @@ public interface MCEntity extends MCMetadatable {
 
 	Set<String> getScoreboardTags();
 
+	boolean hasScoreboardTag(String tag);
+
 	boolean addScoreboardTag(String tag);
 
 	boolean removeScoreboardTag(String tag);

diff --git a/src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCEntity.java b/src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCEntity.java
@@ -336,6 +336,11 @@ public Set<String> getScoreboardTags() {
 		return e.getScoreboardTags();
 	}
 
+	@Override
+	public boolean hasScoreboardTag(String tag) {
+		return e.getScoreboardTags().contains(tag);
+	}
+
 	@Override
 	public boolean addScoreboardTag(String tag) {
 		return e.addScoreboardTag(tag);

diff --git a/src/main/java/com/laytonsmith/core/functions/EntityManagement.java b/src/main/java/com/laytonsmith/core/functions/EntityManagement.java
@@ -4590,6 +4590,31 @@ public Version since() {
 		}
 	}
 
+	@api(environments = {CommandHelperEnvironment.class})
+	public static class has_scoreboard_tag extends EntityGetterFunction {
+
+		@Override
+		public String getName() {
+			return "has_scoreboard_tag";
+		}
+
+		@Override
+		public String docs() {
+			return "boolean {entityUUID, tag} Returns whether this entity has a specific tag.";
+		}
+
+		@Override
+		public Mixed exec(Target t, Environment environment, Mixed... args) throws ConfigRuntimeException {
+			MCEntity e = Static.getEntity(args[0], t);
+			return CBoolean.get(e.hasScoreboardTag(args[1].val()));
+		}
+
+		@Override
+		public Version since() {
+			return MSVersion.V3_3_5;
+		}
+	}
+
 	@api(environments = {CommandHelperEnvironment.class})
 	public static class add_scoreboard_tag extends EntitySetterFunction {