diff --git a/api/src/main/java/ru/dragonestia/msb3/api/dialog/DialogCondition.java b/api/src/main/java/ru/dragonestia/msb3/api/dialog/DialogCondition.java index d9e53af..026c9f1 100644 --- a/api/src/main/java/ru/dragonestia/msb3/api/dialog/DialogCondition.java +++ b/api/src/main/java/ru/dragonestia/msb3/api/dialog/DialogCondition.java @@ -33,7 +33,7 @@ public class DialogCondition { } try { - return condition.get().check(player, dialog, renderer, params); + return condition.get().check(player, dialog, button, renderer, params); } catch (Exception ex) { log.error(ex.getMessage(), ex); DebugMessage.send(player, "Во время проверки условия для кнопки произошла ошибка conditionId=%s params=%s".formatted(conditionId, params)); diff --git a/api/src/main/java/ru/dragonestia/msb3/api/dialog/condition/AlwaysDialogConditionHandler.java b/api/src/main/java/ru/dragonestia/msb3/api/dialog/condition/AlwaysDialogConditionHandler.java index daaafaa..be28e40 100644 --- a/api/src/main/java/ru/dragonestia/msb3/api/dialog/condition/AlwaysDialogConditionHandler.java +++ b/api/src/main/java/ru/dragonestia/msb3/api/dialog/condition/AlwaysDialogConditionHandler.java @@ -2,6 +2,7 @@ package ru.dragonestia.msb3.api.dialog.condition; import net.minestom.server.entity.Player; import ru.dragonestia.msb3.api.dialog.Dialog; +import ru.dragonestia.msb3.api.dialog.DialogButton; import ru.dragonestia.msb3.api.ui.dialogue.DialogueRenderer; import java.util.Map; @@ -9,7 +10,7 @@ import java.util.Map; public class AlwaysDialogConditionHandler implements DialogConditionHandler { @Override - public boolean check(Player player, Dialog dialog, DialogueRenderer renderer, Map params) { + public boolean check(Player player, Dialog dialog, DialogButton button, DialogueRenderer renderer, Map params) { return true; } } diff --git a/api/src/main/java/ru/dragonestia/msb3/api/dialog/condition/DialogConditionHandler.java b/api/src/main/java/ru/dragonestia/msb3/api/dialog/condition/DialogConditionHandler.java index d295a16..107ab48 100644 --- a/api/src/main/java/ru/dragonestia/msb3/api/dialog/condition/DialogConditionHandler.java +++ b/api/src/main/java/ru/dragonestia/msb3/api/dialog/condition/DialogConditionHandler.java @@ -2,11 +2,12 @@ package ru.dragonestia.msb3.api.dialog.condition; import net.minestom.server.entity.Player; import ru.dragonestia.msb3.api.dialog.Dialog; +import ru.dragonestia.msb3.api.dialog.DialogButton; import ru.dragonestia.msb3.api.ui.dialogue.DialogueRenderer; import java.util.Map; public interface DialogConditionHandler { - boolean check(Player player, Dialog dialog, DialogueRenderer renderer, Map params); + boolean check(Player player, Dialog dialog, DialogButton button, DialogueRenderer renderer, Map params); } diff --git a/api/src/main/java/ru/dragonestia/msb3/api/dialog/condition/NeverDialogConditionHandler.java b/api/src/main/java/ru/dragonestia/msb3/api/dialog/condition/NeverDialogConditionHandler.java index 84af135..edb9d5f 100644 --- a/api/src/main/java/ru/dragonestia/msb3/api/dialog/condition/NeverDialogConditionHandler.java +++ b/api/src/main/java/ru/dragonestia/msb3/api/dialog/condition/NeverDialogConditionHandler.java @@ -2,6 +2,7 @@ package ru.dragonestia.msb3.api.dialog.condition; import net.minestom.server.entity.Player; import ru.dragonestia.msb3.api.dialog.Dialog; +import ru.dragonestia.msb3.api.dialog.DialogButton; import ru.dragonestia.msb3.api.ui.dialogue.DialogueRenderer; import java.util.Map; @@ -9,7 +10,7 @@ import java.util.Map; public class NeverDialogConditionHandler implements DialogConditionHandler { @Override - public boolean check(Player player, Dialog dialog, DialogueRenderer renderer, Map params) { + public boolean check(Player player, Dialog dialog, DialogButton button, DialogueRenderer renderer, Map params) { return false; } }