Skip to content

Update CondHasScoreboardTag.java #8248

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 2, 2025
Merged

Update CondHasScoreboardTag.java #8248

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
95b3e80
Update CondHasScoreboardTag.java
sovdeeth Oct 22, 2025
3be27f1
Merge branch 'dev/patch' into patch/scoreboard-tags-or
APickledWalrus Nov 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 20 additions & 21 deletions src/main/java/ch/njol/skript/conditions/CondHasScoreboardTag.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,5 @@
package ch.njol.skript.conditions;

import java.util.Arrays;
import java.util.List;

import org.bukkit.entity.Entity;
import org.bukkit.event.Event;
import org.jetbrains.annotations.Nullable;

import ch.njol.skript.Skript;
import ch.njol.skript.conditions.base.PropertyCondition;
import ch.njol.skript.conditions.base.PropertyCondition.PropertyType;
import ch.njol.skript.doc.Description;
Expand All @@ -17,7 +9,11 @@
import ch.njol.skript.lang.Condition;
import ch.njol.skript.lang.Expression;
import ch.njol.skript.lang.SkriptParser.ParseResult;
import ch.njol.skript.lang.util.SimpleExpression;
import ch.njol.util.Kleenean;
import org.bukkit.entity.Entity;
import org.bukkit.event.Event;
import org.jetbrains.annotations.Nullable;

@Name("Has Scoreboard Tag")
@Description("Checks whether the given entities has the given <a href='#ExprScoreboardTags'>scoreboard tags</a>.")
Expand All @@ -28,33 +24,36 @@ public class CondHasScoreboardTag extends Condition {
static {
PropertyCondition.register(CondHasScoreboardTag.class, PropertyType.HAVE, "[the] score[ ]board tag[s] %strings%", "entities");
}

@SuppressWarnings("null")

private Expression<Entity> entities;
@SuppressWarnings("null")
private Expression<String> tags;

@SuppressWarnings("unchecked")
@Override
@SuppressWarnings("unchecked")
public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
entities = (Expression<Entity>) exprs[0];
tags = (Expression<String>) exprs[1];
setNegated(matchedPattern == 1);
return true;
}

@Override
public boolean check(Event e) {
List<String> tagsList = Arrays.asList(tags.getArray(e));
return entities.check(e,
entity -> entity.getScoreboardTags().containsAll(tagsList),
isNegated());
public boolean check(Event event) {
String[] tagsList = tags.getAll(event);
return entities.check(event,
entity -> SimpleExpression.check(
tagsList,
tag -> entity.getScoreboardTags().contains(tag),
false,
tags.getAnd()
),
isNegated());
}

@Override
public String toString(@Nullable Event e, boolean debug) {
return PropertyCondition.toString(this, PropertyType.HAVE, e, debug, entities,
"the scoreboard " + (tags.isSingle() ? "tag " : "tags ") + tags.toString(e, debug));
public String toString(@Nullable Event event, boolean debug) {
return PropertyCondition.toString(this, PropertyType.HAVE, event, debug, entities,
"the scoreboard " + (tags.isSingle() ? "tag " : "tags ") + tags.toString(event, debug));
}

}