diff --git a/noname/game/index.js b/noname/game/index.js index e971b0536..1cfe8d9ec 100644 --- a/noname/game/index.js +++ b/noname/game/index.js @@ -4653,8 +4653,14 @@ export class Game extends Uninstantable { } /** * @param { string } skill + * @param { lib.element.Player } player */ - static removeGlobalSkill(skill) { + static removeGlobalSkill(skill, player) { + const players = lib.skill.globalmap[skill]; + if(player && Array.isArray(players)) { + lib.skill.globalmap[skill].remove(player); + if(players.length) return; + } lib.skill.global.remove(skill); delete lib.skill.globalmap[skill]; for (let i in lib.hook.globalskill) { diff --git a/noname/get/index.js b/noname/get/index.js index cbb0946c6..e7fb4f235 100644 --- a/noname/get/index.js +++ b/noname/get/index.js @@ -2012,8 +2012,8 @@ export class Get extends Uninstantable { if (info.globalTo) { n += info.globalTo; } - if (info.attaclTo) { - m += info.attaclTo; + if (info.attackTo) { + m += info.attackTo; } } if (method == 'attack') { @@ -2026,8 +2026,8 @@ export class Get extends Uninstantable { // for(let i=0;i