Merge remote-tracking branch 'origin/bugfix' into bugfix

src/public/user.ts

@@ -297,12 +297,9 @@ export class UserFun {
                 if (val == -1 && !gud.headFrames[conf.id]) {
                     change = true;
                     gud.headFrames[conf.id] = -1;
-                } else if (!gud.headFrames[conf.id] || gud.headFrames[conf.id] < G.time) {
+                } else if (val > 0 && gud.headFrames[conf.id] != -1) {
                     change = true;
                     gud.headFrames[conf.id] = G.time + val * v;
-                } else {
-                    change = true;
-                    gud.headFrames[conf.id] += val * v;
                 }
             }
             else if(conf?.cond?.[0] == "jjc_rank") {
@@ -347,12 +344,9 @@ export class UserFun {
                 if (val == -1 && !gud.chatFrames[conf.id]) {
                     change = true;
                     gud.chatFrames[conf.id] = -1;
-                } else if (!gud.chatFrames[conf.id] || gud.chatFrames[conf.id] < G.time) {
+                } else if (val > 0 && gud.chatFrames[conf.id] != -1) {
                     change = true;
                     gud.chatFrames[conf.id] = G.time + val * v;
-                } else {
-                    change = true;
-                    gud.chatFrames[conf.id] += val * v;
                 }
             }
         }