فهرست منبع

Blessing of Eva fix and correction for the command channel handling, thanks Gnacik.

_DS_ 15 سال پیش
والد
کامیت
a80bae54e5
1فایلهای تغییر یافته به همراه12 افزوده شده و 3 حذف شده
  1. 12 3
      L2_GameServer/java/com/l2jserver/gameserver/model/L2Skill.java

+ 12 - 3
L2_GameServer/java/com/l2jserver/gameserver/model/L2Skill.java

@@ -1257,6 +1257,7 @@ public abstract class L2Skill implements IChanceSkillTrigger
 					case WARRIOR_BANE:
 					case BETRAY:
 					case BALANCE_LIFE:
+					case HPMPCPHEAL_PERCENT:
 						canTargetSelf = true;
 						break;
 				}
@@ -2172,9 +2173,17 @@ public abstract class L2Skill implements IChanceSkillTrigger
     			if (target.isInsideZone(L2Character.ZONE_PEACE))
     				return false;
 
-    			if ((player.isInParty() && targetPlayer.isInParty())
-    			        && player.getParty().getPartyLeaderOID() == targetPlayer.getParty().getPartyLeaderOID())
-    				return false;
+    			if (player.isInParty() && targetPlayer.isInParty())
+    			{
+    				// Same party
+    				if (player.getParty().getPartyLeaderOID() == targetPlayer.getParty().getPartyLeaderOID())
+    					return false;
+
+    				// Same commandchannel
+    				if (player.getParty().getCommandChannel() != null
+    						&& player.getParty().getCommandChannel() == targetPlayer.getParty().getCommandChannel())
+    					return false;
+    			}
 
     			if (!TvTEvent.checkForTvTSkill(player, targetPlayer, skill))
     				return false;