Code improvements.

2016-04-24 16:30:15 +00:00
parent 8bd51aba1c
commit 2dd14bef9b
860 changed files with 8865 additions and 17041 deletions
--- a/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java
+++ b/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java
@@ -45,13 +45,7 @@ public class ConditionTargetUsesWeaponKind extends Condition
 		{
 			return false;
 		}
-		
 		final L2Weapon weapon = effected.getActiveWeaponItem();
-		if (weapon == null)
-		{
-			return false;
-		}
-		
-		return (weapon.getItemType().mask() & _weaponMask) != 0;
+		return (weapon != null) && ((weapon.getItemType().mask() & _weaponMask) != 0);
 	}
 }