Merge branch 'Fixed-issue-#4' into 'staging'

Fixed issue #4

See merge request !13

src/server/components/aggro.js

@@ -119,6 +119,9 @@ define([
 		},
 
 		willAttack: function(target) {
+			if (this.obj == target)
+				return false;
+
 			var faction = target.aggro.faction;
 			if (faction == null)
 				return false;