From 5aecad36213371d9609c17889df7b53cda28940a Mon Sep 17 00:00:00 2001 From: zhouhaihai Date: Thu, 24 Sep 2020 14:13:30 +0800 Subject: [PATCH] 安全判定 --- src/actions/AdvAction.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/actions/AdvAction.lua b/src/actions/AdvAction.lua index 6c220e7..b349007 100644 --- a/src/actions/AdvAction.lua +++ b/src/actions/AdvAction.lua @@ -655,7 +655,7 @@ function _M.startBattleRpc(agent, data) if adv:isWaitChooseArtifact() then return end local enemy = adv.battle:getEnemyById(enemyId) - if enemy.monsterId ~= monsterId or enemy.roomId ~= roomId or enemy.blockId ~= blockId or enemy.lock or enemy.isDead then return end + if not enemy or enemy.monsterId ~= monsterId or enemy.roomId ~= roomId or enemy.blockId ~= blockId or enemy.lock or enemy.isDead then return end local key = tostring(math.random()) adv.__battleCache = { @@ -687,7 +687,7 @@ function _M.endBattleRpc(agent, data) if not adv.__battleCache then return end if adv.__battleCache.enemyId ~= enemyId then return end local enemy = adv.battle:getEnemyById(enemyId) - if enemy.monsterId ~= monsterId or enemy.roomId ~= roomId or enemy.blockId ~= blockId then return end + if not enemy or enemy.monsterId ~= monsterId or enemy.roomId ~= roomId or enemy.blockId ~= blockId then return end adv.__battleCache = nil -- 打完野猪怪 -- libgit2 0.21.2