move decorators effect right before constant
| @@ -3651,17 +3651,6 @@ async function checkWorldInfo(chat, maxContext, isDryRun) { | ||
| 3651 | 3651 | entry.decorators = decorators; |
| 3652 | 3652 | entry.content = content; |
| 3653 | 3653 | |
| 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 | - | |
| 3665 | 3654 | // Check if this entry applies to the character or if it's excluded |
| 3666 | 3655 | if (entry.characterFilter && entry.characterFilter?.names?.length > 0) { |
| 3667 | 3656 | const nameIncluded = entry.characterFilter.names.includes(getCharaFilename()); |
| @@ -3725,6 +3714,17 @@ async function checkWorldInfo(chat, maxContext, isDryRun) { | ||
| 3725 | 3714 | continue; |
| 3726 | 3715 | } |
| 3727 | 3716 | |
| 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 | + | |
| 3728 | 3728 | if (entry.constant || buffer.isExternallyActivated(entry) || isSticky) { |
| 3729 | 3729 | activatedNow.add(entry); |
| 3730 | 3730 | continue; |