Skip to content

Commit 5c98e12

Browse files
committed
Add has_scoreboard_tag()
1 parent 4259442 commit 5c98e12

File tree

3 files changed

+32
-0
lines changed

3 files changed

+32
-0
lines changed

src/main/java/com/laytonsmith/abstraction/MCEntity.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,8 @@ public interface MCEntity extends MCMetadatable {
9999

100100
Set<String> getScoreboardTags();
101101

102+
boolean hasScoreboardTag(String tag);
103+
102104
boolean addScoreboardTag(String tag);
103105

104106
boolean removeScoreboardTag(String tag);

src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCEntity.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,11 @@ public Set<String> getScoreboardTags() {
336336
return e.getScoreboardTags();
337337
}
338338

339+
@Override
340+
public boolean hasScoreboardTag(String tag) {
341+
return e.getScoreboardTags().contains(tag);
342+
}
343+
339344
@Override
340345
public boolean addScoreboardTag(String tag) {
341346
return e.addScoreboardTag(tag);

src/main/java/com/laytonsmith/core/functions/EntityManagement.java

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4590,6 +4590,31 @@ public Version since() {
45904590
}
45914591
}
45924592

4593+
@api(environments = {CommandHelperEnvironment.class})
4594+
public static class has_scoreboard_tag extends EntityGetterFunction {
4595+
4596+
@Override
4597+
public String getName() {
4598+
return "has_scoreboard_tag";
4599+
}
4600+
4601+
@Override
4602+
public String docs() {
4603+
return "boolean {entityUUID, tag} Returns whether this entity has a specific tag.";
4604+
}
4605+
4606+
@Override
4607+
public Mixed exec(Target t, Environment environment, Mixed... args) throws ConfigRuntimeException {
4608+
MCEntity e = Static.getEntity(args[0], t);
4609+
return CBoolean.get(e.hasScoreboardTag(args[1].val()));
4610+
}
4611+
4612+
@Override
4613+
public Version since() {
4614+
return MSVersion.V3_3_5;
4615+
}
4616+
}
4617+
45934618
@api(environments = {CommandHelperEnvironment.class})
45944619
public static class add_scoreboard_tag extends EntitySetterFunction {
45954620

0 commit comments

Comments
 (0)