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

BETA: Core-Part for [DP10153]

Nos 11 éve
szülő
commit
026bacd240

+ 6 - 5
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Character.java

@@ -5058,12 +5058,12 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 			
 			// reduce targets HP
 			target.reduceCurrentHp(damage, this, null);
-			target.notifyDamageReceived(damage, this, null, crit);
+			target.notifyDamageReceived(damage, this, null, crit, false);
 			
 			if (reflectedDamage > 0)
 			{
 				reduceCurrentHp(reflectedDamage, target, true, false, null);
-				notifyDamageReceived(reflectedDamage, target, null, crit);
+				notifyDamageReceived(reflectedDamage, target, null, crit, false);
 			}
 			
 			if (!isBow) // Do not absorb if weapon is of type bow
@@ -7063,11 +7063,12 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 	 * @param attacker
 	 * @param skill
 	 * @param critical
+	 * @param damageOverTime
 	 */
-	public void notifyDamageReceived(double damage, L2Character attacker, L2Skill skill, boolean critical)
+	public void notifyDamageReceived(double damage, L2Character attacker, L2Skill skill, boolean critical, boolean damageOverTime)
 	{
-		getEvents().onDamageReceived(damage, attacker, skill, critical);
-		attacker.getEvents().onDamageDealt(damage, this, skill, critical);
+		getEvents().onDamageReceived(damage, attacker, skill, critical, damageOverTime);
+		attacker.getEvents().onDamageDealt(damage, this, skill, critical, damageOverTime);
 	}
 	
 	/**

+ 6 - 4
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/events/CharEvents.java

@@ -184,8 +184,9 @@ public class CharEvents extends AbstractCharEvents
 	 * @param target
 	 * @param skill
 	 * @param crit
+	 * @param damageOverTime
 	 */
-	public void onDamageDealt(double damage, L2Character target, L2Skill skill, boolean crit)
+	public void onDamageDealt(double damage, L2Character target, L2Skill skill, boolean crit, boolean damageOverTime)
 	{
 		if (hasListeners())
 		{
@@ -198,7 +199,7 @@ public class CharEvents extends AbstractCharEvents
 						continue;
 					}
 					
-					listener.onDamageDealtEvent(getActingPlayer(), target, damage, skill, crit);
+					listener.onDamageDealtEvent(getActingPlayer(), target, damage, skill, crit, damageOverTime);
 				}
 				catch (Exception e)
 				{
@@ -218,8 +219,9 @@ public class CharEvents extends AbstractCharEvents
 	 * @param attacker
 	 * @param skill
 	 * @param crit
+	 * @param damageOverTime
 	 */
-	public void onDamageReceived(double damage, L2Character attacker, L2Skill skill, boolean crit)
+	public void onDamageReceived(double damage, L2Character attacker, L2Skill skill, boolean crit, boolean damageOverTime)
 	{
 		if (hasListeners())
 		{
@@ -232,7 +234,7 @@ public class CharEvents extends AbstractCharEvents
 						continue;
 					}
 					
-					listener.onDamageReceivedEvent(attacker, getActingPlayer(), damage, skill, crit);
+					listener.onDamageReceivedEvent(attacker, getActingPlayer(), damage, skill, crit, damageOverTime);
 				}
 				catch (Exception e)
 				{

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/events/listeners/IDamageDealtEventListener.java

@@ -26,5 +26,5 @@ import com.l2jserver.gameserver.model.skills.L2Skill;
  */
 public interface IDamageDealtEventListener extends IEventListener
 {
-	public void onDamageDealtEvent(L2Character attacker, L2Character target, double damage, L2Skill skill, boolean crit);
+	public void onDamageDealtEvent(L2Character attacker, L2Character target, double damage, L2Skill skill, boolean crit, boolean damageOverTime);
 }

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/events/listeners/IDamageReceivedEventListener.java

@@ -26,5 +26,5 @@ import com.l2jserver.gameserver.model.skills.L2Skill;
  */
 public interface IDamageReceivedEventListener extends IEventListener
 {
-	public void onDamageReceivedEvent(L2Character attacker, L2Character target, double damage, L2Skill skill, boolean crit);
+	public void onDamageReceivedEvent(L2Character attacker, L2Character target, double damage, L2Skill skill, boolean crit, boolean damageOverTime);
 }