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/ConditionPlayerInstanceId.java
+++ b/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java
@@ -55,10 +55,6 @@ public class ConditionPlayerInstanceId extends Condition
 		}
 		
 		final InstanceWorld world = InstanceManager.getInstance().getPlayerWorld(effector.getActingPlayer());
-		if ((world == null) || (world.getInstanceId() != instanceId))
-		{
-			return false; // player in the different instance
-		}
-		return _instanceIds.contains(world.getTemplateId());
+		return (world != null) && (world.getInstanceId() == instanceId) && _instanceIds.contains(world.getTemplateId());
 	}
 }