From b52173be2ed1826a469da0e0d4b2c88d9ed006d9 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Fri, 3 Mar 2023 10:35:57 +0800
Subject: [PATCH] 1

---
 server/gameserver/creature.cc | 2 +-
 third_party/a8                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/gameserver/creature.cc b/server/gameserver/creature.cc
index 1b081022..53d7bfd2 100644
--- a/server/gameserver/creature.cc
+++ b/server/gameserver/creature.cc
@@ -1064,7 +1064,7 @@ void Creature::CancelAction()
 {
     if (action_type == AT_Relive) {
         Entity* entity = room->GetEntityByUniId(action_target_id);
-        if (!entity->IsEntityType(ET_Player)) {
+        if (entity && entity->IsEntityType(ET_Player)) {
             Human* hum = (Human*)entity;
             if (hum->action_type == AT_Rescue) {
                 hum->CancelAction();
diff --git a/third_party/a8 b/third_party/a8
index 7bd14674..ee8724d5 160000
--- a/third_party/a8
+++ b/third_party/a8
@@ -1 +1 @@
-Subproject commit 7bd146740195fbf3d0268fd873708f4ec2f56ab6
+Subproject commit ee8724d50b4487d8684b9ad47942c5e622ce93b8