[PlaneShift-svn] SF.net SVN: planeshift:[7641] trunk/src/server/combatmanager.cpp

[<wel...@us...>]

Revision: 7641
          http://planeshift.svn.sourceforge.net/planeshift/?rev=7641&view=rev
Author:   weltall2
Date:     2011-09-12 11:49:38 +0000 (Mon, 12 Sep 2011)
Log Message:
-----------
fixed PS#5181 - Bows take damage when ammo depleted patch by kalaspuffar

Modified Paths:
--------------
    trunk/src/server/combatmanager.cpp

Modified: trunk/src/server/combatmanager.cpp
===================================================================
--- trunk/src/server/combatmanager.cpp	2011-09-10 15:25:42 UTC (rev 7640)
+++ trunk/src/server/combatmanager.cpp	2011-09-12 11:49:38 UTC (rev 7641)
@@ -703,7 +703,8 @@
             {
                 weapon->AddDecay(weaponDecay->GetValue());
             }
-            if (blockingWeapon)
+            //TODO: for now we disable decaying for bows (see PS#5181)
+            if (blockingWeapon && !blockingWeapon->GetIsRangeWeapon())
             {
                 blockingWeapon->AddDecay(blockDecay->GetValue());
             }

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