From 568150682019c8e13cb72210066548e2c90c2dd0 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 29 一月 2019 14:13:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into FestivalRedpack
---
System/Message/RichMoveEvent.cs | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/System/Message/RichMoveEvent.cs b/System/Message/RichMoveEvent.cs
index 9138e64..7aba772 100644
--- a/System/Message/RichMoveEvent.cs
+++ b/System/Message/RichMoveEvent.cs
@@ -121,7 +121,7 @@
//}
//else
//{
- MoveToMapPos(_mapId, x, y, line);
+ MoveToMapPos(_mapId, x, y, line);
//}
}
break;
@@ -211,7 +211,8 @@
yield break;
}
- while (_hero.SkillMgr.CurCastSkill != null &&
+ while (_hero != null &&
+ _hero.SkillMgr.CurCastSkill != null &&
_hero.SkillMgr.CurCastSkill.SkillCompelete == false)
{
yield return null;
@@ -219,6 +220,11 @@
{
yield break;
}
+ }
+
+ if (_hero == null)
+ {
+ yield break;
}
MapTransferUtility.Instance.MoveToNPC(id);
@@ -233,11 +239,18 @@
yield break;
}
- while (_hero.SkillMgr.CurCastSkill != null &&
+ while (_hero != null &&
+ _hero.SkillMgr.CurCastSkill != null &&
_hero.SkillMgr.CurCastSkill.SkillCompelete == false)
{
yield return null;
}
+
+ if (_hero == null)
+ {
+ yield break;
+ }
+
pos.y = _hero.Pos.y;
_hero.MoveToPosition(pos);
}
--
Gitblit v1.8.0