summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErik Schilling <ablu.erikschilling@googlemail.com>2012-08-01 12:22:20 +0200
committerErik Schilling <ablu.erikschilling@googlemail.com>2012-08-01 12:23:12 +0200
commita7f69d60d17edd817a3039327c699d6c755a621d (patch)
tree6c2f898b0d6ca816aad37387bf8737122ac455fa
parente2d0ef9a01bf4c3b02915ef70a3d45fce40332fc (diff)
downloadmanaserv-a7f69d60d17edd817a3039327c699d6c755a621d.tar.gz
manaserv-a7f69d60d17edd817a3039327c699d6c755a621d.tar.bz2
manaserv-a7f69d60d17edd817a3039327c699d6c755a621d.tar.xz
manaserv-a7f69d60d17edd817a3039327c699d6c755a621d.zip
Fixed removing of unarmed attack when equipping other weapons
-rw-r--r--src/game-server/character.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/game-server/character.cpp b/src/game-server/character.cpp
index 679c8ff1..a4652313 100644
--- a/src/game-server/character.cpp
+++ b/src/game-server/character.cpp
@@ -770,8 +770,8 @@ void Character::resumeNpcThread()
void Character::addAttack(AttackInfo *attackInfo)
{
// Remove knuckle attack
- Being::removeAttack(mKnuckleAttackInfo);
Being::addAttack(attackInfo);
+ Being::removeAttack(mKnuckleAttackInfo);
}
void Character::removeAttack(AttackInfo *attackInfo)
@@ -779,7 +779,6 @@ void Character::removeAttack(AttackInfo *attackInfo)
// Add knuckle attack
if (mAttacks.getNumber() == 1)
{
-
Being::addAttack(mKnuckleAttackInfo);
}
Being::removeAttack(attackInfo);