NotEvil/TiedUp-
2
1
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

feature/d01-branch-a-bridge #6

Merged
NotEvil merged 11 commits from feature/d01-branch-a-bridge into develop 2026-04-14 15:19:21 +00:00
Conversation 0 Commits 11 Files Changed 21 +3 -1
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d1b864c4ec - Show all commits

4
src/main/java/com/tiedup/remake/v2/bondage/TyingInteractionHelper.java
View File

@@ -85,9 +85,11 @@ public final class TyingInteractionHelper {
TyingTask currentTask = playerState.getCurrentTyingTask(); TyingTask currentTask = playerState.getCurrentTyingTask();
if (currentTask == null if (currentTask == null
|| !(currentTask instanceof V2TyingPlayerTask)
|| !currentTask.isSameTarget(target) || !currentTask.isSameTarget(target)
|| currentTask.isOutdated() || currentTask.isOutdated()
|| !ItemStack.matches(currentTask.getBind(), stack)) { || !ItemStack.matches(currentTask.getBind(), stack)) {
// Start new task (also handles case where existing task is V1 TyingPlayerTask)
playerState.setCurrentTyingTask(newTask); playerState.setCurrentTyingTask(newTask);
newTask.start(); newTask.start();
} else { } else {
@@ -97,7 +99,7 @@ public final class TyingInteractionHelper {
newTask.update(); newTask.update();
if (newTask.isStopped()) { if (newTask.isStopped()) {
stack.shrink(1); // Item already consumed by V2TyingPlayerTask.onComplete() — don't shrink again
playerState.setCurrentTyingTask(null); playerState.setCurrentTyingTask(null);
TiedUpMod.LOGGER.info("[TyingInteraction] {} tied {}", player.getName().getString(), target.getName().getString()); TiedUpMod.LOGGER.info("[TyingInteraction] {} tied {}", player.getName().getString(), target.getName().getString());
} }