1 files changed, 7 insertions, 4 deletions
diff --git a/src/game-server/character.cpp b/src/game-server/character.cpp
index e17abc2b..7e0dc125 100644
--- a/src/game-server/character.cpp
+++ b/src/game-server/character.cpp
@@ -116,11 +116,14 @@ void Character::update()
 
 void Character::perform()
 {
-    if (mAction != ATTACK || mActionTime > 0 || mTarget == NULL) return;
+    if (mAction != ATTACK || mTarget == NULL) return;
 
-    mActionTime = 1000;
-    mAction = STAND;
-    raiseUpdateFlags(UPDATEFLAG_ATTACK);
+    // wait before next attack
+    if (mActionTime > 100)
+    {
+        mActionTime -= 100;
+        return;
+    }
 
     // TODO: Check slot 2 too.
     int itemId = mPossessions.equipment[EQUIP_FIGHT1_SLOT];