From fec75cff6fbf0b060887a45fb96a3d930a20bb63 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sun, 29 Dec 2019 23:55:31 +0000
Subject: [PATCH] Fixed toggle auto buffs.

---
 .../gameserver/model/actor/instance/PlayerInstance.java         | 2 +-
 .../gameserver/model/actor/instance/PlayerInstance.java         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 75b3dc1191..81992d1311 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
@@ -14147,7 +14147,7 @@ public class PlayerInstance extends Playable
 					removeAutoSkill(skillId);
 					continue;
 				}
-				if (!hasSkillReuse(skill.getReuseHashCode()))
+				if (!isAffectedBySkill(skillId) && !isInsideZone(ZoneId.PEACE))
 				{
 					doCast(skill);
 				}
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 cf1048e26c..2a771db4c4 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
@@ -14093,7 +14093,7 @@ public class PlayerInstance extends Playable
 					removeAutoSkill(skillId);
 					continue;
 				}
-				if (!hasSkillReuse(skill.getReuseHashCode()))
+				if (!isAffectedBySkill(skillId) && !isInsideZone(ZoneId.PEACE))
 				{
 					doCast(skill);
 				}