1

server/gameserver/effect.cc

@@ -1,3 +1,9 @@
 #include "precompile.h"
 
 #include "effect.h"
+#include "creature.h"
+
+void Effect::RemoveFromOwner()
+{
+    owner->RemoveEffect(effect_uniid);
+}

server/gameserver/effect.h

@@ -16,5 +16,6 @@ class Effect
     Creature* owner = nullptr;
 
     void FillMFEffect(cs::MFEffect* effect_pb);
+    void RemoveFromOwner();
 
 };

server/gameserver/gungrasp.cc

@@ -101,8 +101,7 @@ private:
     {
         for (auto& effect : effect_list) {
             if (!effect.expired()) {
-                auto p = effect.lock();
-                p->owner->RemoveEffect(effect);
+                effect.lock()->RemoveFromOwner();
             }
         }
         effect_list.clear();