Commit b09fd7b
mergetest
Fix combat freeze: build-once-leave-it parity with the combat-proven DF_AuraLab
Krathe's DF_AuraLab renders a CustomAuraContainer correctly THROUGH combat with the SAME build
sequence as ours — so the freeze was us re-touching the live container in combat (Blizzard drives
it; touching it re-enters the secret aura path and silently latches its dirty engine). Diffed the
lab vs ours and removed every in-combat container touch:
- bindNative: drop the slot.DurationTextBinding:SetTextColorCurve poke on live buttons — dead path
(private field, SetDurationText drops the required property arg; port plan §2.8) that mutates
Blizzard-owned binding state. Colour-by-time returns via the bucket formatter in P2. The lab's
initFrame never touches the binding.
- Handle:ApplyStyle: combat-guard — in lockdown, stash _pendingRestyle and return without touching
buttons; the regen handler replays it OOC (skipped if a queued rebuild subsumes it).
- DriveBuffFactory/DriveDefensiveFactory: SetAlpha/SetShown only on actual state change (cached);
the layout-version re-apply block (Rebuild/ApplyStyle/formatter churn on live buttons) gated to
OOC — version stays stale in combat, catches up on the first out-of-combat drive.
- Icons.lua + the external GetFrame():Hide() sites clear the shown-cache so it can't go stale.
Net: in combat a standing container is never touched by any DF path — matches the lab. Unverified.1 parent e66d915 commit b09fd7b
3 files changed
Lines changed: 84 additions & 29 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2559 | 2559 | | |
2560 | 2560 | | |
2561 | 2561 | | |
2562 | | - | |
| 2562 | + | |
| 2563 | + | |
| 2564 | + | |
| 2565 | + | |
| 2566 | + | |
| 2567 | + | |
| 2568 | + | |
| 2569 | + | |
| 2570 | + | |
2563 | 2571 | | |
2564 | 2572 | | |
2565 | 2573 | | |
| |||
2573 | 2581 | | |
2574 | 2582 | | |
2575 | 2583 | | |
2576 | | - | |
| 2584 | + | |
| 2585 | + | |
| 2586 | + | |
| 2587 | + | |
| 2588 | + | |
| 2589 | + | |
2577 | 2590 | | |
2578 | | - | |
| 2591 | + | |
| 2592 | + | |
| 2593 | + | |
| 2594 | + | |
| 2595 | + | |
2579 | 2596 | | |
2580 | | - | |
| 2597 | + | |
2581 | 2598 | | |
2582 | 2599 | | |
2583 | 2600 | | |
| |||
2717 | 2734 | | |
2718 | 2735 | | |
2719 | 2736 | | |
2720 | | - | |
| 2737 | + | |
| 2738 | + | |
| 2739 | + | |
| 2740 | + | |
| 2741 | + | |
| 2742 | + | |
| 2743 | + | |
2721 | 2744 | | |
2722 | 2745 | | |
2723 | | - | |
| 2746 | + | |
| 2747 | + | |
| 2748 | + | |
2724 | 2749 | | |
2725 | | - | |
| 2750 | + | |
2726 | 2751 | | |
2727 | 2752 | | |
2728 | 2753 | | |
| |||
2764 | 2789 | | |
2765 | 2790 | | |
2766 | 2791 | | |
| 2792 | + | |
2767 | 2793 | | |
2768 | 2794 | | |
2769 | 2795 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
419 | 419 | | |
420 | 420 | | |
421 | 421 | | |
422 | | - | |
423 | | - | |
424 | | - | |
425 | | - | |
426 | | - | |
427 | | - | |
428 | | - | |
429 | | - | |
430 | | - | |
| 422 | + | |
| 423 | + | |
| 424 | + | |
| 425 | + | |
| 426 | + | |
| 427 | + | |
| 428 | + | |
| 429 | + | |
| 430 | + | |
431 | 431 | | |
432 | 432 | | |
433 | 433 | | |
| |||
870 | 870 | | |
871 | 871 | | |
872 | 872 | | |
| 873 | + | |
| 874 | + | |
| 875 | + | |
| 876 | + | |
| 877 | + | |
| 878 | + | |
| 879 | + | |
| 880 | + | |
| 881 | + | |
| 882 | + | |
| 883 | + | |
873 | 884 | | |
874 | 885 | | |
875 | 886 | | |
| |||
978 | 989 | | |
979 | 990 | | |
980 | 991 | | |
| 992 | + | |
981 | 993 | | |
982 | 994 | | |
983 | 995 | | |
| |||
1002 | 1014 | | |
1003 | 1015 | | |
1004 | 1016 | | |
| 1017 | + | |
| 1018 | + | |
1005 | 1019 | | |
1006 | 1020 | | |
1007 | 1021 | | |
1008 | | - | |
1009 | | - | |
1010 | | - | |
1011 | | - | |
1012 | | - | |
1013 | | - | |
1014 | | - | |
1015 | | - | |
1016 | | - | |
1017 | | - | |
| 1022 | + | |
| 1023 | + | |
| 1024 | + | |
| 1025 | + | |
| 1026 | + | |
| 1027 | + | |
| 1028 | + | |
| 1029 | + | |
| 1030 | + | |
| 1031 | + | |
| 1032 | + | |
| 1033 | + | |
| 1034 | + | |
| 1035 | + | |
| 1036 | + | |
| 1037 | + | |
| 1038 | + | |
| 1039 | + | |
1018 | 1040 | | |
1019 | 1041 | | |
1020 | 1042 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1105 | 1105 | | |
1106 | 1106 | | |
1107 | 1107 | | |
1108 | | - | |
| 1108 | + | |
| 1109 | + | |
| 1110 | + | |
| 1111 | + | |
1109 | 1112 | | |
1110 | 1113 | | |
1111 | 1114 | | |
1112 | | - | |
| 1115 | + | |
1113 | 1116 | | |
1114 | 1117 | | |
1115 | | - | |
| 1118 | + | |
| 1119 | + | |
| 1120 | + | |
| 1121 | + | |
1116 | 1122 | | |
1117 | 1123 | | |
1118 | 1124 | | |
| |||
1127 | 1133 | | |
1128 | 1134 | | |
1129 | 1135 | | |
| 1136 | + | |
1130 | 1137 | | |
1131 | 1138 | | |
1132 | 1139 | | |
| |||
0 commit comments