move decorators effect right before constant

3b0e07d0938f8b240994f8eff7d6e77c5c220103

kwaroran <amasio1234@proton.me>

1 files changed, +11 -11Showing whitespace changes
public/scripts/world-info.js+11 -11
@@ -3651,17 +3651,6 @@ async function checkWorldInfo(chat, maxContext, isDryRun) {
36513651 entry.decorators = decorators;
36523652 entry.content = content;
36533653
3654- if(decorators.includes('@@activate')){
3655- //activate in any case
3656- activatedNow.add(entry);
3657- continue;
3658- }
3659-
3660- if(decorators.includes('@@dont_activate')){
3661- //deactivate in any case if @@activate is not present
3662- continue;
3663- }
3664-
36653654 // Check if this entry applies to the character or if it's excluded
36663655 if (entry.characterFilter && entry.characterFilter?.names?.length > 0) {
36673656 const nameIncluded = entry.characterFilter.names.includes(getCharaFilename());
@@ -3725,6 +3714,17 @@ async function checkWorldInfo(chat, maxContext, isDryRun) {
37253714 continue;
37263715 }
37273716
3717+ if(decorators.includes('@@activate')){
3718+ //activate in any case
3719+ activatedNow.add(entry);
3720+ continue;
3721+ }
3722+
3723+ if(decorators.includes('@@dont_activate')){
3724+ //deactivate in any case if @@activate is not present
3725+ continue;
3726+ }
3727+
37283728 if (entry.constant || buffer.isExternallyActivated(entry) || isSticky) {
37293729 activatedNow.add(entry);
37303730 continue;