From e74b14e6550b4ac4b385ae6b74c7219416823342 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sun, 3 Nov 2019 08:54:33 +0000
Subject: [PATCH] Prevent pulling debuff blocked characters.

---
 .../game/data/scripts/handlers/effecthandlers/PullBack.java  | 5 +++++
 .../game/data/scripts/handlers/effecthandlers/PullBack.java  | 5 +++++
 .../game/data/scripts/handlers/effecthandlers/PullBack.java  | 5 +++++
 .../game/data/scripts/handlers/effecthandlers/PullBack.java  | 5 +++++
 .../game/data/scripts/handlers/effecthandlers/PullBack.java  | 5 +++++
 .../game/data/scripts/handlers/effecthandlers/PullBack.java  | 5 +++++
 .../game/data/scripts/handlers/effecthandlers/PullBack.java  | 5 +++++
 .../game/data/scripts/handlers/effecthandlers/PullBack.java  | 5 +++++
 .../game/data/scripts/handlers/effecthandlers/PullBack.java  | 5 +++++
 .../game/data/scripts/handlers/effecthandlers/PullBack.java  | 5 +++++
 .../game/data/scripts/handlers/effecthandlers/PullBack.java  | 5 +++++
 .../game/data/scripts/handlers/effecthandlers/PullBack.java  | 5 +++++
 .../game/data/scripts/handlers/effecthandlers/PullBack.java  | 5 +++++
 .../game/data/scripts/handlers/effecthandlers/PullBack.java  | 5 +++++
 .../game/data/scripts/handlers/effecthandlers/PullBack.java  | 5 +++++
 15 files changed, 75 insertions(+)

diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PullBack.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PullBack.java
index dd3e3185d0..6de78c2c82 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PullBack.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PullBack.java
@@ -66,6 +66,11 @@ public class PullBack extends AbstractEffect
 		{
 			return;
 		}
+		// Prevent pulling debuff blocked characters.
+		if ((effected.isDebuffBlocked()))
+		{
+			return;
+		}
 		
 		// In retail, you get debuff, but you are not even moved if there is obstacle. You are still disabled from using skills and moving though.
 		if (GeoEngine.getInstance().canMoveToTarget(effected.getX(), effected.getY(), effected.getZ(), effector.getX(), effector.getY(), effector.getZ(), effector.getInstanceWorld()))
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PullBack.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PullBack.java
index dd3e3185d0..6de78c2c82 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PullBack.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PullBack.java
@@ -66,6 +66,11 @@ public class PullBack extends AbstractEffect
 		{
 			return;
 		}
+		// Prevent pulling debuff blocked characters.
+		if ((effected.isDebuffBlocked()))
+		{
+			return;
+		}
 		
 		// In retail, you get debuff, but you are not even moved if there is obstacle. You are still disabled from using skills and moving though.
 		if (GeoEngine.getInstance().canMoveToTarget(effected.getX(), effected.getY(), effected.getZ(), effector.getX(), effector.getY(), effector.getZ(), effector.getInstanceWorld()))
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PullBack.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PullBack.java
index dd3e3185d0..6de78c2c82 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PullBack.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PullBack.java
@@ -66,6 +66,11 @@ public class PullBack extends AbstractEffect
 		{
 			return;
 		}
+		// Prevent pulling debuff blocked characters.
+		if ((effected.isDebuffBlocked()))
+		{
+			return;
+		}
 		
 		// In retail, you get debuff, but you are not even moved if there is obstacle. You are still disabled from using skills and moving though.
 		if (GeoEngine.getInstance().canMoveToTarget(effected.getX(), effected.getY(), effected.getZ(), effector.getX(), effector.getY(), effector.getZ(), effector.getInstanceWorld()))
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PullBack.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PullBack.java
index dd3e3185d0..6de78c2c82 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PullBack.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PullBack.java
@@ -66,6 +66,11 @@ public class PullBack extends AbstractEffect
 		{
 			return;
 		}
+		// Prevent pulling debuff blocked characters.
+		if ((effected.isDebuffBlocked()))
+		{
+			return;
+		}
 		
 		// In retail, you get debuff, but you are not even moved if there is obstacle. You are still disabled from using skills and moving though.
 		if (GeoEngine.getInstance().canMoveToTarget(effected.getX(), effected.getY(), effected.getZ(), effector.getX(), effector.getY(), effector.getZ(), effector.getInstanceWorld()))
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PullBack.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PullBack.java
index dd3e3185d0..6de78c2c82 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PullBack.java
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PullBack.java
@@ -66,6 +66,11 @@ public class PullBack extends AbstractEffect
 		{
 			return;
 		}
+		// Prevent pulling debuff blocked characters.
+		if ((effected.isDebuffBlocked()))
+		{
+			return;
+		}
 		
 		// In retail, you get debuff, but you are not even moved if there is obstacle. You are still disabled from using skills and moving though.
 		if (GeoEngine.getInstance().canMoveToTarget(effected.getX(), effected.getY(), effected.getZ(), effector.getX(), effector.getY(), effector.getZ(), effector.getInstanceWorld()))
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PullBack.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PullBack.java
index dd3e3185d0..6de78c2c82 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PullBack.java
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PullBack.java
@@ -66,6 +66,11 @@ public class PullBack extends AbstractEffect
 		{
 			return;
 		}
+		// Prevent pulling debuff blocked characters.
+		if ((effected.isDebuffBlocked()))
+		{
+			return;
+		}
 		
 		// In retail, you get debuff, but you are not even moved if there is obstacle. You are still disabled from using skills and moving though.
 		if (GeoEngine.getInstance().canMoveToTarget(effected.getX(), effected.getY(), effected.getZ(), effector.getX(), effector.getY(), effector.getZ(), effector.getInstanceWorld()))
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PullBack.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PullBack.java
index dd3e3185d0..6de78c2c82 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PullBack.java
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PullBack.java
@@ -66,6 +66,11 @@ public class PullBack extends AbstractEffect
 		{
 			return;
 		}
+		// Prevent pulling debuff blocked characters.
+		if ((effected.isDebuffBlocked()))
+		{
+			return;
+		}
 		
 		// In retail, you get debuff, but you are not even moved if there is obstacle. You are still disabled from using skills and moving though.
 		if (GeoEngine.getInstance().canMoveToTarget(effected.getX(), effected.getY(), effected.getZ(), effector.getX(), effector.getY(), effector.getZ(), effector.getInstanceWorld()))
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PullBack.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PullBack.java
index dd3e3185d0..6de78c2c82 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PullBack.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PullBack.java
@@ -66,6 +66,11 @@ public class PullBack extends AbstractEffect
 		{
 			return;
 		}
+		// Prevent pulling debuff blocked characters.
+		if ((effected.isDebuffBlocked()))
+		{
+			return;
+		}
 		
 		// In retail, you get debuff, but you are not even moved if there is obstacle. You are still disabled from using skills and moving though.
 		if (GeoEngine.getInstance().canMoveToTarget(effected.getX(), effected.getY(), effected.getZ(), effector.getX(), effector.getY(), effector.getZ(), effector.getInstanceWorld()))
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PullBack.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PullBack.java
index dd3e3185d0..6de78c2c82 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PullBack.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PullBack.java
@@ -66,6 +66,11 @@ public class PullBack extends AbstractEffect
 		{
 			return;
 		}
+		// Prevent pulling debuff blocked characters.
+		if ((effected.isDebuffBlocked()))
+		{
+			return;
+		}
 		
 		// In retail, you get debuff, but you are not even moved if there is obstacle. You are still disabled from using skills and moving though.
 		if (GeoEngine.getInstance().canMoveToTarget(effected.getX(), effected.getY(), effected.getZ(), effector.getX(), effector.getY(), effector.getZ(), effector.getInstanceWorld()))
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PullBack.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PullBack.java
index dd3e3185d0..6de78c2c82 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PullBack.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PullBack.java
@@ -66,6 +66,11 @@ public class PullBack extends AbstractEffect
 		{
 			return;
 		}
+		// Prevent pulling debuff blocked characters.
+		if ((effected.isDebuffBlocked()))
+		{
+			return;
+		}
 		
 		// In retail, you get debuff, but you are not even moved if there is obstacle. You are still disabled from using skills and moving though.
 		if (GeoEngine.getInstance().canMoveToTarget(effected.getX(), effected.getY(), effected.getZ(), effector.getX(), effector.getY(), effector.getZ(), effector.getInstanceWorld()))
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PullBack.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PullBack.java
index dd3e3185d0..6de78c2c82 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PullBack.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PullBack.java
@@ -66,6 +66,11 @@ public class PullBack extends AbstractEffect
 		{
 			return;
 		}
+		// Prevent pulling debuff blocked characters.
+		if ((effected.isDebuffBlocked()))
+		{
+			return;
+		}
 		
 		// In retail, you get debuff, but you are not even moved if there is obstacle. You are still disabled from using skills and moving though.
 		if (GeoEngine.getInstance().canMoveToTarget(effected.getX(), effected.getY(), effected.getZ(), effector.getX(), effector.getY(), effector.getZ(), effector.getInstanceWorld()))
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PullBack.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PullBack.java
index dd3e3185d0..6de78c2c82 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PullBack.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PullBack.java
@@ -66,6 +66,11 @@ public class PullBack extends AbstractEffect
 		{
 			return;
 		}
+		// Prevent pulling debuff blocked characters.
+		if ((effected.isDebuffBlocked()))
+		{
+			return;
+		}
 		
 		// In retail, you get debuff, but you are not even moved if there is obstacle. You are still disabled from using skills and moving though.
 		if (GeoEngine.getInstance().canMoveToTarget(effected.getX(), effected.getY(), effected.getZ(), effector.getX(), effector.getY(), effector.getZ(), effector.getInstanceWorld()))
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PullBack.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PullBack.java
index dd3e3185d0..6de78c2c82 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PullBack.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PullBack.java
@@ -66,6 +66,11 @@ public class PullBack extends AbstractEffect
 		{
 			return;
 		}
+		// Prevent pulling debuff blocked characters.
+		if ((effected.isDebuffBlocked()))
+		{
+			return;
+		}
 		
 		// In retail, you get debuff, but you are not even moved if there is obstacle. You are still disabled from using skills and moving though.
 		if (GeoEngine.getInstance().canMoveToTarget(effected.getX(), effected.getY(), effected.getZ(), effector.getX(), effector.getY(), effector.getZ(), effector.getInstanceWorld()))
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PullBack.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PullBack.java
index dd3e3185d0..6de78c2c82 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PullBack.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PullBack.java
@@ -66,6 +66,11 @@ public class PullBack extends AbstractEffect
 		{
 			return;
 		}
+		// Prevent pulling debuff blocked characters.
+		if ((effected.isDebuffBlocked()))
+		{
+			return;
+		}
 		
 		// In retail, you get debuff, but you are not even moved if there is obstacle. You are still disabled from using skills and moving though.
 		if (GeoEngine.getInstance().canMoveToTarget(effected.getX(), effected.getY(), effected.getZ(), effector.getX(), effector.getY(), effector.getZ(), effector.getInstanceWorld()))
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PullBack.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PullBack.java
index dd3e3185d0..6de78c2c82 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PullBack.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PullBack.java
@@ -66,6 +66,11 @@ public class PullBack extends AbstractEffect
 		{
 			return;
 		}
+		// Prevent pulling debuff blocked characters.
+		if ((effected.isDebuffBlocked()))
+		{
+			return;
+		}
 		
 		// In retail, you get debuff, but you are not even moved if there is obstacle. You are still disabled from using skills and moving though.
 		if (GeoEngine.getInstance().canMoveToTarget(effected.getX(), effected.getY(), effected.getZ(), effector.getX(), effector.getY(), effector.getZ(), effector.getInstanceWorld()))