Merge pull request #1132 from IceCola97/master
修复了threaten.target调用会出现错误的bug,另外优化了一下threaten的调用
This commit is contained in:
commit
32e4b34072
|
@ -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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue