diff options
| author | Krakenied <Krakenied1@gmail.com> | 2023-05-27 16:21:50 +0200 |
|---|---|---|
| committer | Krakenied <Krakenied1@gmail.com> | 2023-05-27 16:21:50 +0200 |
| commit | 0086abeaeb41d94c684cedae916ea0b97b2b7a5a (patch) | |
| tree | 1fd340a7e78e5973815936ba341c785fa2fa9736 /bukkit | |
| parent | 924bba7da5912150c1273b0d0b32f23001dd1e6a (diff) | |
Do not color mythic mobs killing task type mob name
Improve matchString performance
Diffstat (limited to 'bukkit')
3 files changed, 6 insertions, 6 deletions
diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/BuildingTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/BuildingTaskType.java index 1137a767..8dd745d7 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/BuildingTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/BuildingTaskType.java @@ -96,7 +96,7 @@ public final class BuildingTaskType extends BukkitTaskType { super.debug("reverse-if-broken is enabled, checking block", quest.getId(), task.getId(), event.getPlayer().getUniqueId()); - if (!TaskUtils.matchBlock(this, pendingTask, block, player.getUniqueId())) { // TODO + if (!TaskUtils.matchBlock(this, pendingTask, block, player.getUniqueId())) { super.debug("Continuing...", quest.getId(), task.getId(), player.getUniqueId()); continue; } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/MythicMobsKillingTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/MythicMobsKillingTaskType.java index 9ca4beb4..aa8d92fc 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/MythicMobsKillingTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/MythicMobsKillingTaskType.java @@ -104,7 +104,7 @@ public final class MythicMobsKillingTaskType extends BukkitTaskType { super.debug("Player killed mythic mob '" + mobName + "' (level = " + level + ")", quest.getId(), task.getId(), player.getUniqueId()); - if (!TaskUtils.matchString(this, pendingTask, "name", "names", mobName, true, false, player.getUniqueId())) { + if (!TaskUtils.matchString(this, pendingTask, "name", "names", mobName, false, false, player.getUniqueId())) { super.debug("Continuing...", quest.getId(), task.getId(), player.getUniqueId()); continue; } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/util/TaskUtils.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/util/TaskUtils.java index cce1a4e3..9b7f0246 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/util/TaskUtils.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/util/TaskUtils.java @@ -294,13 +294,13 @@ public class TaskUtils { return false; } + if (legacyColor) { + string = Chat.legacyColor(string); + } + for (String name : checkNames) { type.debug("Checking against name " + string, pendingTask.quest.getId(), task.getId(), player); - if (legacyColor) { - string = Chat.legacyColor(string); - } - if (StringUtils.equals(string, name, ignoreCase)) { type.debug("Name match", pendingTask.quest.getId(), task.getId(), player); return true; |
