Merge pull request #1132 from IceCola97/master

修复了threaten.target调用会出现错误的bug,另外优化了一下threaten的调用
This commit is contained in:
Spmario233 2024-03-26 09:06:49 +08:00 committed by GitHub
commit 32e4b34072
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 10 deletions

View File

@ -4415,18 +4415,13 @@ export class Get extends Uninstantable {
zeroplayer = true; zeroplayer = true;
zerotarget = true; zerotarget = true;
} }
if (typeof temp3 == 'function' && temp3(player, target) != undefined) { if (typeof temp3 == 'object') {
threaten *= temp3(player, target); temp3 = temp3.target;
} }
else if (typeof temp3 == 'object') { if (typeof temp3 == 'function') {
if (typeof temp3.target == 'number') { temp3 = temp3(player, target);
threaten *= temp3;
}
else if (typeof temp3.target == 'function' && temp3(player, target) != undefined) {
threaten *= temp3(player, target);
}
} }
else if (typeof temp3 == 'number') { if (typeof temp3 == 'number') {
threaten *= temp3; threaten *= temp3;
} }
} }