Commit 5aecad36213371d9609c17889df7b53cda28940a

Authored by zhouhaihai
1 parent 3ed95697

安全判定

Showing 1 changed file with 2 additions and 2 deletions   Show diff stats
src/actions/AdvAction.lua
... ... @@ -655,7 +655,7 @@ function _M.startBattleRpc(agent, data)
655 655 if adv:isWaitChooseArtifact() then return end
656 656 local enemy = adv.battle:getEnemyById(enemyId)
657 657  
658   - if enemy.monsterId ~= monsterId or enemy.roomId ~= roomId or enemy.blockId ~= blockId or enemy.lock or enemy.isDead then return end
  658 + if not enemy or enemy.monsterId ~= monsterId or enemy.roomId ~= roomId or enemy.blockId ~= blockId or enemy.lock or enemy.isDead then return end
659 659  
660 660 local key = tostring(math.random())
661 661 adv.__battleCache = {
... ... @@ -687,7 +687,7 @@ function _M.endBattleRpc(agent, data)
687 687 if not adv.__battleCache then return end
688 688 if adv.__battleCache.enemyId ~= enemyId then return end
689 689 local enemy = adv.battle:getEnemyById(enemyId)
690   - if enemy.monsterId ~= monsterId or enemy.roomId ~= roomId or enemy.blockId ~= blockId then return end
  690 + if not enemy or enemy.monsterId ~= monsterId or enemy.roomId ~= roomId or enemy.blockId ~= blockId then return end
691 691 adv.__battleCache = nil
692 692  
693 693 -- 打完野猪怪
... ...