Merging Source v1.7.2: item changes

2014-10-21 00:38:15 -04:00
parent 4a49763309
commit 13afc9df8d
32 changed files with 523 additions and 269 deletions
@@ -94,9 +94,9 @@ public class MissileWeapon extends Weapon {
 		super.proc( attacker, defender, damage );
 		
 		Hero hero = (Hero)attacker;
-		if (!hero.usingRanged && stackable) {
-			if (quantity == 1) {
-				doUnequip( hero, false );
+        if (hero.rangedWeapon == null && stackable) {
+            if (quantity == 1) {
+                doUnequip( hero, false, false );
 			} else {
 				detach( null );
 			}