From e2f2c70ba4ee0205dbe7f6ebb81e79dd0872d9e8 Mon Sep 17 00:00:00 2001 From: treeston Date: Wed, 13 Jan 2016 15:33:17 +0100 Subject: Merge branch '3.3.5-bossboundary' into 3.3.5-base (PR #16089) (cherry picked from commit 5b8b8c653039ec2add0b3a66468abb85e6f35054) --- src/server/scripts/World/npcs_special.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/server/scripts/World') diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp index 90d15131bc4..87616548350 100644 --- a/src/server/scripts/World/npcs_special.cpp +++ b/src/server/scripts/World/npcs_special.cpp @@ -1434,9 +1434,9 @@ public: _events.ScheduleEvent(EVENT_TD_DESPAWN, 15000); } - void EnterEvadeMode() override + void EnterEvadeMode(EvadeReason why) override { - if (!_EnterEvadeMode()) + if (!_EnterEvadeMode(why)) return; Reset(); -- cgit v1.2.3