Forráskód Böngészése

Revert last commit. Commited wrong file. (Somehow i messed my workspace.)

nBd 15 éve
szülő
commit
4ab01886a4

+ 6 - 6
L2_GameServer/java/com/l2jserver/gameserver/model/actor/status/PcStatus.java

@@ -65,12 +65,12 @@ public class PcStatus extends PlayableStatus
 
 		if (getActiveChar().isInvul())
 		{
-			// other chars can't damage
-			if (attacker != getActiveChar())
-				return;
-
-			// only DOT and HP consumption allowed for damage self
-			if (!isDOT && !isHPConsumption)
+			if (attacker == getActiveChar())
+			{
+				if (!isDOT && !isHPConsumption)
+					return;
+			}
+			else
 				return;
 		}
 

+ 0 - 1
L2_GameServer/java/com/l2jserver/gameserver/model/actor/status/SummonStatus.java

@@ -46,7 +46,6 @@ public class SummonStatus extends PlayableStatus
 							|| getActiveChar().getOwner().getDuelId() != attackerPlayer.getDuelId()))
 				attackerPlayer.setDuelState(Duel.DUELSTATE_INTERRUPTED);
 		}
-		
 		super.reduceHp(value, attacker, awake, isDOT, isHPConsumption);
 	}