Explorar o código

BETA: Improvement in '''!ConditionTargetMyPartyExceptMe'''.
Patch by: UnAfraid
Reported by: jurchiks

Adry_85 %!s(int64=12) %!d(string=hai) anos
pai
achega
1d26d51921

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2Party.java

@@ -1151,6 +1151,6 @@ public class L2Party extends AbstractPlayerGroup
 	 */
 	public boolean equals(L2Party party)
 	{
-		return (getLeaderObjectId() == party.getLeaderObjectId());
+		return (party != null) && (getLeaderObjectId() == party.getLeaderObjectId());
 	}
 }

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java

@@ -52,7 +52,7 @@ public class ConditionTargetMyPartyExceptMe extends Condition
 			player.sendPacket(SystemMessageId.CANNOT_USE_ON_YOURSELF);
 			isPartyMember = false;
 		}
-		else if ((target.getParty() == null) || (player.isInParty() && target.isInParty() && (player.getParty().getLeaderObjectId() != target.getParty().getLeaderObjectId())))
+		else if (!player.isInParty() || !player.getParty().equals(target.getParty()))
 		{
 			final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED);
 			sm.addSkillName(env.getSkill());