Merge branch 'issue-42' into 'staging'

Fixes #42

See merge request !25

src/server/combat/combat.js

@@ -56,9 +56,6 @@ define([
 					isCrit = true;
 					amount *= 1.5;
 				}
-
-				if (isCrit)
-					amount *= 1.5;
 			}
 
 			return {