Skip to content

Fix name conditions #583

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
Chronoken merged 1 commit into from
Apr 30, 2022
Merged

Fix name conditions #583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 3 additions & 5 deletions .../src/main/java/com/nisovin/magicspells/castmodifiers/conditions/DisplayNameCondition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,16 @@
import org.bukkit.entity.LivingEntity;
import com.nisovin.magicspells.util.Util;

import net.kyori.adventure.text.Component;

import com.nisovin.magicspells.castmodifiers.Condition;

public class DisplayNameCondition extends Condition {

private Component displayName;
private String displayName;

@Override
public boolean initialize(String var) {
if (var == null || var.isEmpty()) return false;
displayName = Util.getMiniMessage(var);
displayName = Util.getStringFromComponent(Util.getMiniMessage(var));
return true;
}

Expand All @@ -28,7 +26,7 @@ public boolean check(LivingEntity livingEntity) {
@Override
public boolean check(LivingEntity livingEntity, LivingEntity target) {
if (!(target instanceof Player player)) return false;
return player.displayName().equals(displayName);
return Util.getStringFromComponent(player.displayName()).equals(displayName);
}

@Override
Expand Down
10 changes: 4 additions & 6 deletions core/src/main/java/com/nisovin/magicspells/castmodifiers/conditions/NameCondition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,18 @@

import org.bukkit.Location;
import org.bukkit.entity.LivingEntity;
import com.nisovin.magicspells.util.Util;

import net.kyori.adventure.text.Component;

import com.nisovin.magicspells.util.Util;
import com.nisovin.magicspells.castmodifiers.Condition;

public class NameCondition extends Condition {

private Component name;
private String name;

@Override
public boolean initialize(String var) {
if (var == null || var.isEmpty()) return false;
name = Util.getMiniMessage(var);
name = Util.getPlainString(Util.getMiniMessage(var));
return true;
}

Expand All @@ -26,7 +24,7 @@ public boolean check(LivingEntity livingEntity) {

@Override
public boolean check(LivingEntity livingEntity, LivingEntity target) {
return target.name().equals(name);
return Util.getPlainString(target.name()).equals(name);
}

@Override
Expand Down