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

feature/d01-branch-e-resistance #10

Merged
NotEvil merged 3 commits from feature/d01-branch-e-resistance into develop 2026-04-15 01:45:59 +00:00
Conversation 0 Commits 3 Files Changed 35 +19 -1
2 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 36a1d63510 - Show all commits

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

@@ -149,6 +149,10 @@ public class PacketV2LockToggle {
return;
}
// Clear partial knife-cut progress and stale struggle resistance on unlock
com.tiedup.remake.util.ItemNBTHelper.remove(stack, "knifeCutProgress");
com.tiedup.remake.util.ItemNBTHelper.remove(stack, "accessoryStruggleResistance");
TiedUpMod.LOGGER.debug(
"[V2LockToggle] Unlocked region {} on entity {}",
region.name(),

16
src/main/java/com/tiedup/remake/v2/bondage/network/PacketV2StruggleStart.java
View File

@@ -84,7 +84,21 @@ public class PacketV2StruggleStart {
if (stack.getItem() instanceof ILockable lockable) {
isLocked = lockable.isLocked(stack);
if (isLocked) {
resistance += com.tiedup.remake.core.SettingsAccessor.getPadlockResistance(null);
// Only add padlock bonus on FIRST session (fresh resistance = base).
// If resistance was already decremented and persisted from a prior
// interrupted session, the padlock bonus is already baked in.
int baseResistance = resistance; // getCurrentResistance returns base if no NBT
com.tiedup.remake.v2.bondage.component.ResistanceComponent comp =
com.tiedup.remake.v2.bondage.datadriven.DataDrivenBondageItem.getComponent(
stack, com.tiedup.remake.v2.bondage.component.ComponentType.RESISTANCE,
com.tiedup.remake.v2.bondage.component.ResistanceComponent.class);
if (comp != null) {
baseResistance = comp.getBaseResistance();
}
if (resistance >= baseResistance) {
// Fresh or fully restored — add padlock bonus
resistance += com.tiedup.remake.core.SettingsAccessor.getPadlockResistance(null);
}
}
}