diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index d29aeaac21..7b46d5d923 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -3895,12 +3895,12 @@ public class PlayerInstance extends Playable public boolean isSpawnProtected() { - return _spawnProtectEndTime > System.currentTimeMillis(); + return (_spawnProtectEndTime != 0) && (_spawnProtectEndTime > System.currentTimeMillis()); } public boolean isTeleportProtected() { - return _teleportProtectEndTime > System.currentTimeMillis(); + return (_teleportProtectEndTime != 0) && (_teleportProtectEndTime > System.currentTimeMillis()); } public void setSpawnProtection(boolean protect) diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 252d789aee..d504b68354 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -3901,12 +3901,12 @@ public class PlayerInstance extends Playable public boolean isSpawnProtected() { - return _spawnProtectEndTime > System.currentTimeMillis(); + return (_spawnProtectEndTime != 0) && (_spawnProtectEndTime > System.currentTimeMillis()); } public boolean isTeleportProtected() { - return _teleportProtectEndTime > System.currentTimeMillis(); + return (_teleportProtectEndTime != 0) && (_teleportProtectEndTime > System.currentTimeMillis()); } public void setSpawnProtection(boolean protect) diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 81dfae94e6..9064da3d00 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -3903,12 +3903,12 @@ public class PlayerInstance extends Playable public boolean isSpawnProtected() { - return _spawnProtectEndTime > System.currentTimeMillis(); + return (_spawnProtectEndTime != 0) && (_spawnProtectEndTime > System.currentTimeMillis()); } public boolean isTeleportProtected() { - return _teleportProtectEndTime > System.currentTimeMillis(); + return (_teleportProtectEndTime != 0) && (_teleportProtectEndTime > System.currentTimeMillis()); } public void setSpawnProtection(boolean protect) diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index eaabcf174b..6094232c90 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -3898,12 +3898,12 @@ public class PlayerInstance extends Playable public boolean isSpawnProtected() { - return _spawnProtectEndTime > System.currentTimeMillis(); + return (_spawnProtectEndTime != 0) && (_spawnProtectEndTime > System.currentTimeMillis()); } public boolean isTeleportProtected() { - return _teleportProtectEndTime > System.currentTimeMillis(); + return (_teleportProtectEndTime != 0) && (_teleportProtectEndTime > System.currentTimeMillis()); } public void setSpawnProtection(boolean protect) diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 625bf56bd5..11d03bad01 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -3876,12 +3876,12 @@ public class PlayerInstance extends Playable public boolean isSpawnProtected() { - return _spawnProtectEndTime > System.currentTimeMillis(); + return (_spawnProtectEndTime != 0) && (_spawnProtectEndTime > System.currentTimeMillis()); } public boolean isTeleportProtected() { - return _teleportProtectEndTime > System.currentTimeMillis(); + return (_teleportProtectEndTime != 0) && (_teleportProtectEndTime > System.currentTimeMillis()); } public void setSpawnProtection(boolean protect) diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index f4d8aef511..9d763917dd 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -3876,12 +3876,12 @@ public class PlayerInstance extends Playable public boolean isSpawnProtected() { - return _spawnProtectEndTime > System.currentTimeMillis(); + return (_spawnProtectEndTime != 0) && (_spawnProtectEndTime > System.currentTimeMillis()); } public boolean isTeleportProtected() { - return _teleportProtectEndTime > System.currentTimeMillis(); + return (_teleportProtectEndTime != 0) && (_teleportProtectEndTime > System.currentTimeMillis()); } public void setSpawnProtection(boolean protect) diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 7b040e1c0a..0eef006c8f 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -3877,12 +3877,12 @@ public class PlayerInstance extends Playable public boolean isSpawnProtected() { - return _spawnProtectEndTime > System.currentTimeMillis(); + return (_spawnProtectEndTime != 0) && (_spawnProtectEndTime > System.currentTimeMillis()); } public boolean isTeleportProtected() { - return _teleportProtectEndTime > System.currentTimeMillis(); + return (_teleportProtectEndTime != 0) && (_teleportProtectEndTime > System.currentTimeMillis()); } public void setSpawnProtection(boolean protect) diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 910d203458..dbea2ad7da 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -3797,12 +3797,12 @@ public class PlayerInstance extends Playable public boolean isSpawnProtected() { - return _spawnProtectEndTime > System.currentTimeMillis(); + return (_spawnProtectEndTime != 0) && (_spawnProtectEndTime > System.currentTimeMillis()); } public boolean isTeleportProtected() { - return _teleportProtectEndTime > System.currentTimeMillis(); + return (_teleportProtectEndTime != 0) && (_teleportProtectEndTime > System.currentTimeMillis()); } public void setSpawnProtection(boolean protect) diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index c4e2fdd1a5..a8a6573198 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -922,12 +922,12 @@ public class PlayerInstance extends Playable public boolean isSpawnProtected() { - return _protectEndTime > GameTimeController.getGameTicks(); + return (_protectEndTime != 0) && (_protectEndTime > GameTimeController.getGameTicks()); } public boolean isTeleportProtected() { - return _teleportProtectEndTime > GameTimeController.getGameTicks(); + return (_teleportProtectEndTime != 0) && (_teleportProtectEndTime > GameTimeController.getGameTicks()); } /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 7f8638979c..faf612d441 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -3937,12 +3937,12 @@ public class PlayerInstance extends Playable public boolean isSpawnProtected() { - return _spawnProtectEndTime > System.currentTimeMillis(); + return (_spawnProtectEndTime != 0) && (_spawnProtectEndTime > System.currentTimeMillis()); } public boolean isTeleportProtected() { - return _teleportProtectEndTime > System.currentTimeMillis(); + return (_teleportProtectEndTime != 0) && (_teleportProtectEndTime > System.currentTimeMillis()); } public void setSpawnProtection(boolean protect) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index ea1135991a..efa085fc01 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -3848,12 +3848,12 @@ public class PlayerInstance extends Playable public boolean isSpawnProtected() { - return _spawnProtectEndTime > System.currentTimeMillis(); + return (_spawnProtectEndTime != 0) && (_spawnProtectEndTime > System.currentTimeMillis()); } public boolean isTeleportProtected() { - return _teleportProtectEndTime > System.currentTimeMillis(); + return (_teleportProtectEndTime != 0) && (_teleportProtectEndTime > System.currentTimeMillis()); } public void setSpawnProtection(boolean protect) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index d0729fc9c4..0b953e2b47 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -3870,12 +3870,12 @@ public class PlayerInstance extends Playable public boolean isSpawnProtected() { - return _spawnProtectEndTime > System.currentTimeMillis(); + return (_spawnProtectEndTime != 0) && (_spawnProtectEndTime > System.currentTimeMillis()); } public boolean isTeleportProtected() { - return _teleportProtectEndTime > System.currentTimeMillis(); + return (_teleportProtectEndTime != 0) && (_teleportProtectEndTime > System.currentTimeMillis()); } public void setSpawnProtection(boolean protect) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 6b1874d9f5..1f9017df77 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -3871,12 +3871,12 @@ public class PlayerInstance extends Playable public boolean isSpawnProtected() { - return _spawnProtectEndTime > System.currentTimeMillis(); + return (_spawnProtectEndTime != 0) && (_spawnProtectEndTime > System.currentTimeMillis()); } public boolean isTeleportProtected() { - return _teleportProtectEndTime > System.currentTimeMillis(); + return (_teleportProtectEndTime != 0) && (_teleportProtectEndTime > System.currentTimeMillis()); } public void setSpawnProtection(boolean protect) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 2a2b57cd7f..bf2dff922f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -3854,12 +3854,12 @@ public class PlayerInstance extends Playable public boolean isSpawnProtected() { - return _spawnProtectEndTime > System.currentTimeMillis(); + return (_spawnProtectEndTime != 0) && (_spawnProtectEndTime > System.currentTimeMillis()); } public boolean isTeleportProtected() { - return _teleportProtectEndTime > System.currentTimeMillis(); + return (_teleportProtectEndTime != 0) && (_teleportProtectEndTime > System.currentTimeMillis()); } public void setSpawnProtection(boolean protect) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 1d1814f6c6..9f1fd4fe09 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -3865,12 +3865,12 @@ public class PlayerInstance extends Playable public boolean isSpawnProtected() { - return _spawnProtectEndTime > System.currentTimeMillis(); + return (_spawnProtectEndTime != 0) && (_spawnProtectEndTime > System.currentTimeMillis()); } public boolean isTeleportProtected() { - return _teleportProtectEndTime > System.currentTimeMillis(); + return (_teleportProtectEndTime != 0) && (_teleportProtectEndTime > System.currentTimeMillis()); } public void setSpawnProtection(boolean protect) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 3fde02af65..8b89daa375 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -3865,12 +3865,12 @@ public class PlayerInstance extends Playable public boolean isSpawnProtected() { - return _spawnProtectEndTime > System.currentTimeMillis(); + return (_spawnProtectEndTime != 0) && (_spawnProtectEndTime > System.currentTimeMillis()); } public boolean isTeleportProtected() { - return _teleportProtectEndTime > System.currentTimeMillis(); + return (_teleportProtectEndTime != 0) && (_teleportProtectEndTime > System.currentTimeMillis()); } public void setSpawnProtection(boolean protect) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 8f4481b82a..43be56d952 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -3768,12 +3768,12 @@ public class PlayerInstance extends Playable public boolean isSpawnProtected() { - return _spawnProtectEndTime > System.currentTimeMillis(); + return (_spawnProtectEndTime != 0) && (_spawnProtectEndTime > System.currentTimeMillis()); } public boolean isTeleportProtected() { - return _teleportProtectEndTime > System.currentTimeMillis(); + return (_teleportProtectEndTime != 0) && (_teleportProtectEndTime > System.currentTimeMillis()); } public void setSpawnProtection(boolean protect) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index f12dff6c96..34cc3b2677 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -3871,12 +3871,12 @@ public class PlayerInstance extends Playable public boolean isSpawnProtected() { - return _spawnProtectEndTime > System.currentTimeMillis(); + return (_spawnProtectEndTime != 0) && (_spawnProtectEndTime > System.currentTimeMillis()); } public boolean isTeleportProtected() { - return _teleportProtectEndTime > System.currentTimeMillis(); + return (_teleportProtectEndTime != 0) && (_teleportProtectEndTime > System.currentTimeMillis()); } public void setSpawnProtection(boolean protect)