[PlaneShift-svn] SF.net SVN: planeshift: [1820] trunk

[<mr...@us...>]

Revision: 1820
          http://planeshift.svn.sourceforge.net/planeshift/?rev=1820&view=rev
Author:   mr_dave
Date:     2008-06-28 14:11:59 -0700 (Sat, 28 Jun 2008)

Log Message:
-----------
Fixed FS#564

Modified Paths:
--------------
    trunk/docs/history.txt
    trunk/src/server/bulkobjects/pscharacter.cpp
    trunk/src/server/gem.cpp

Modified: trunk/docs/history.txt
===================================================================
--- trunk/docs/history.txt	2008-06-28 09:47:15 UTC (rev 1819)
+++ trunk/docs/history.txt	2008-06-28 21:11:59 UTC (rev 1820)
@@ -1,3 +1,6 @@
+*** 2008-06-28 by Dave Bentham
+- Fixed FS#564 - erroneous "..is already dead" text after kill by magic.
+
 *** 2008-06-27 by Roland Schulz
 - change int64_t to int64, windows doesn't have the former
 

Modified: trunk/src/server/bulkobjects/pscharacter.cpp
===================================================================
--- trunk/src/server/bulkobjects/pscharacter.cpp	2008-06-28 09:47:15 UTC (rev 1819)
+++ trunk/src/server/bulkobjects/pscharacter.cpp	2008-06-28 21:11:59 UTC (rev 1820)
@@ -1103,7 +1103,6 @@
     {
         spellCasting->Interrupt();
     }
-    SetSpellCasting(NULL);
 }
 
 void psCharacter::SetTradeWork(psWorkGameEvent * event)

Modified: trunk/src/server/gem.cpp
===================================================================
--- trunk/src/server/gem.cpp	2008-06-28 09:47:15 UTC (rev 1819)
+++ trunk/src/server/gem.cpp	2008-06-28 21:11:59 UTC (rev 1820)
@@ -2097,7 +2097,12 @@
             SetMode(PSCHARACTER_MODE_DEAD);
         }
 
-        psserver->combatmanager->StopAttack(attacker);
+        // if damage due to spell then spell is ending anyway, so no need to force
+        // 'stop attack.'
+        if (attacker->GetMode() == PSCHARACTER_MODE_COMBAT)
+        {
+            psserver->combatmanager->StopAttack(attacker);
+        }
     }
 
     // Update group stats and it's own


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.