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/ConditionChangeWeapon.java
+++ b/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java
@ -53,17 +53,7 @@ public class ConditionChangeWeapon extends Condition
 		if (_required)
 		{
 			final L2Weapon weaponItem = effector.getActiveWeaponItem();
-			if (weaponItem == null)
-			{
-				return false;
-			}
-			
-			if (weaponItem.getChangeWeaponId() == 0)
-			{
-				return false;
-			}
-			
-			if (effector.getActingPlayer().hasItemRequest())
+			if ((weaponItem == null) || (weaponItem.getChangeWeaponId() == 0) || effector.getActingPlayer().hasItemRequest())
 			{
 				return false;
 			}