From 1a0931dd55f492bcf6c88fb332caf562d5fed85d Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Wed, 6 Sep 2017 19:56:04 +0000
Subject: [PATCH] Fixed L2DamageZone ApplyDamage execution NPE.

---
 .../com/l2jmobius/gameserver/model/zone/type/L2DamageZone.java  | 2 +-
 .../com/l2jmobius/gameserver/model/zone/type/L2DamageZone.java  | 2 +-
 .../com/l2jmobius/gameserver/model/zone/type/L2DamageZone.java  | 2 +-
 .../com/l2jmobius/gameserver/model/zone/type/L2DamageZone.java  | 2 +-
 .../com/l2jmobius/gameserver/model/zone/type/L2DamageZone.java  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/zone/type/L2DamageZone.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/zone/type/L2DamageZone.java
index ab4c97288c..9801290712 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/zone/type/L2DamageZone.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/zone/type/L2DamageZone.java
@@ -206,7 +206,7 @@ public class L2DamageZone extends L2ZoneType
 					
 					if (getHPDamagePerSecond() != 0)
 					{
-						temp.reduceCurrentHp(_dmgZone.getHPDamagePerSecond() * multiplier, null, null);
+						temp.reduceCurrentHp(_dmgZone.getHPDamagePerSecond() * multiplier, temp, null);
 					}
 					if (getMPDamagePerSecond() != 0)
 					{
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/zone/type/L2DamageZone.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/zone/type/L2DamageZone.java
index ab4c97288c..9801290712 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/zone/type/L2DamageZone.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/zone/type/L2DamageZone.java
@@ -206,7 +206,7 @@ public class L2DamageZone extends L2ZoneType
 					
 					if (getHPDamagePerSecond() != 0)
 					{
-						temp.reduceCurrentHp(_dmgZone.getHPDamagePerSecond() * multiplier, null, null);
+						temp.reduceCurrentHp(_dmgZone.getHPDamagePerSecond() * multiplier, temp, null);
 					}
 					if (getMPDamagePerSecond() != 0)
 					{
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/zone/type/L2DamageZone.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/zone/type/L2DamageZone.java
index ab4c97288c..9801290712 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/zone/type/L2DamageZone.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/zone/type/L2DamageZone.java
@@ -206,7 +206,7 @@ public class L2DamageZone extends L2ZoneType
 					
 					if (getHPDamagePerSecond() != 0)
 					{
-						temp.reduceCurrentHp(_dmgZone.getHPDamagePerSecond() * multiplier, null, null);
+						temp.reduceCurrentHp(_dmgZone.getHPDamagePerSecond() * multiplier, temp, null);
 					}
 					if (getMPDamagePerSecond() != 0)
 					{
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/type/L2DamageZone.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/type/L2DamageZone.java
index 7d7544a940..d6fe0ba3b4 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/type/L2DamageZone.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/type/L2DamageZone.java
@@ -199,7 +199,7 @@ public class L2DamageZone extends L2ZoneType
 					
 					if (getHPDamagePerSecond() != 0)
 					{
-						temp.reduceCurrentHp(_dmgZone.getHPDamagePerSecond() * multiplier, null, null);
+						temp.reduceCurrentHp(_dmgZone.getHPDamagePerSecond() * multiplier, temp, null);
 					}
 					if (getMPDamagePerSecond() != 0)
 					{
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/zone/type/L2DamageZone.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/zone/type/L2DamageZone.java
index ab4c97288c..9801290712 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/zone/type/L2DamageZone.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/zone/type/L2DamageZone.java
@@ -206,7 +206,7 @@ public class L2DamageZone extends L2ZoneType
 					
 					if (getHPDamagePerSecond() != 0)
 					{
-						temp.reduceCurrentHp(_dmgZone.getHPDamagePerSecond() * multiplier, null, null);
+						temp.reduceCurrentHp(_dmgZone.getHPDamagePerSecond() * multiplier, temp, null);
 					}
 					if (getMPDamagePerSecond() != 0)
 					{