From 5777b4ac775d4c0561b40be8028a140f4342a0b5 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sat, 14 Aug 2021 11:44:32 +0000
Subject: [PATCH] Remove queued skill upon move request.

---
 .../network/clientpackets/MoveBackwardToLocation.java       | 6 ++++++
 .../network/clientpackets/MoveBackwardToLocation.java       | 6 ++++++
 .../network/clientpackets/MoveBackwardToLocation.java       | 6 ++++++
 .../network/clientpackets/MoveBackwardToLocation.java       | 6 ++++++
 .../network/clientpackets/MoveBackwardToLocation.java       | 6 ++++++
 .../network/clientpackets/MoveBackwardToLocation.java       | 6 ++++++
 .../network/clientpackets/MoveBackwardToLocation.java       | 6 ++++++
 .../network/clientpackets/MoveBackwardToLocation.java       | 6 ++++++
 .../network/clientpackets/MoveBackwardToLocation.java       | 6 ++++++
 .../network/clientpackets/MoveBackwardToLocation.java       | 6 ++++++
 .../network/clientpackets/MoveBackwardToLocation.java       | 6 ++++++
 .../network/clientpackets/MoveBackwardToLocation.java       | 6 ++++++
 .../network/clientpackets/MoveBackwardToLocation.java       | 6 ++++++
 .../network/clientpackets/MoveBackwardToLocation.java       | 6 ++++++
 .../network/clientpackets/MoveBackwardToLocation.java       | 6 ++++++
 .../network/clientpackets/MoveBackwardToLocation.java       | 6 ++++++
 .../network/clientpackets/MoveBackwardToLocation.java       | 6 ++++++
 .../network/clientpackets/MoveBackwardToLocation.java       | 6 ++++++
 .../network/clientpackets/MoveBackwardToLocation.java       | 6 ++++++
 .../network/clientpackets/MoveBackwardToLocation.java       | 6 ++++++
 .../network/clientpackets/MoveBackwardToLocation.java       | 6 ++++++
 21 files changed, 126 insertions(+)

diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java
index 854d89da8d..bce8c05275 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java
@@ -237,6 +237,12 @@ public class MoveBackwardToLocation implements IClientIncomingPacket
 			}
 		}
 		
+		// Remove queued skill upon move request.
+		if (player.getQueuedSkill() != null)
+		{
+			player.setQueuedSkill(null, null, false, false);
+		}
+		
 		// Mobius: Check spawn protections.
 		player.onActionRequest();
 	}
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java
index 854d89da8d..bce8c05275 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java
@@ -237,6 +237,12 @@ public class MoveBackwardToLocation implements IClientIncomingPacket
 			}
 		}
 		
+		// Remove queued skill upon move request.
+		if (player.getQueuedSkill() != null)
+		{
+			player.setQueuedSkill(null, null, false, false);
+		}
+		
 		// Mobius: Check spawn protections.
 		player.onActionRequest();
 	}
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java
index 854d89da8d..bce8c05275 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java
@@ -237,6 +237,12 @@ public class MoveBackwardToLocation implements IClientIncomingPacket
 			}
 		}
 		
+		// Remove queued skill upon move request.
+		if (player.getQueuedSkill() != null)
+		{
+			player.setQueuedSkill(null, null, false, false);
+		}
+		
 		// Mobius: Check spawn protections.
 		player.onActionRequest();
 	}
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java
index 854d89da8d..bce8c05275 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java
@@ -237,6 +237,12 @@ public class MoveBackwardToLocation implements IClientIncomingPacket
 			}
 		}
 		
+		// Remove queued skill upon move request.
+		if (player.getQueuedSkill() != null)
+		{
+			player.setQueuedSkill(null, null, false, false);
+		}
+		
 		// Mobius: Check spawn protections.
 		player.onActionRequest();
 	}
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java
index 854d89da8d..bce8c05275 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java
@@ -237,6 +237,12 @@ public class MoveBackwardToLocation implements IClientIncomingPacket
 			}
 		}
 		
+		// Remove queued skill upon move request.
+		if (player.getQueuedSkill() != null)
+		{
+			player.setQueuedSkill(null, null, false, false);
+		}
+		
 		// Mobius: Check spawn protections.
 		player.onActionRequest();
 	}
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java
index 854d89da8d..bce8c05275 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java
@@ -237,6 +237,12 @@ public class MoveBackwardToLocation implements IClientIncomingPacket
 			}
 		}
 		
+		// Remove queued skill upon move request.
+		if (player.getQueuedSkill() != null)
+		{
+			player.setQueuedSkill(null, null, false, false);
+		}
+		
 		// Mobius: Check spawn protections.
 		player.onActionRequest();
 	}
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java
index 854d89da8d..bce8c05275 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java
@@ -237,6 +237,12 @@ public class MoveBackwardToLocation implements IClientIncomingPacket
 			}
 		}
 		
+		// Remove queued skill upon move request.
+		if (player.getQueuedSkill() != null)
+		{
+			player.setQueuedSkill(null, null, false, false);
+		}
+		
 		// Mobius: Check spawn protections.
 		player.onActionRequest();
 	}
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java
index 854d89da8d..bce8c05275 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java
@@ -237,6 +237,12 @@ public class MoveBackwardToLocation implements IClientIncomingPacket
 			}
 		}
 		
+		// Remove queued skill upon move request.
+		if (player.getQueuedSkill() != null)
+		{
+			player.setQueuedSkill(null, null, false, false);
+		}
+		
 		// Mobius: Check spawn protections.
 		player.onActionRequest();
 	}
diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java
index 854d89da8d..bce8c05275 100644
--- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java
+++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java
@@ -237,6 +237,12 @@ public class MoveBackwardToLocation implements IClientIncomingPacket
 			}
 		}
 		
+		// Remove queued skill upon move request.
+		if (player.getQueuedSkill() != null)
+		{
+			player.setQueuedSkill(null, null, false, false);
+		}
+		
 		// Mobius: Check spawn protections.
 		player.onActionRequest();
 	}
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java
index 854d89da8d..bce8c05275 100644
--- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java
+++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java
@@ -237,6 +237,12 @@ public class MoveBackwardToLocation implements IClientIncomingPacket
 			}
 		}
 		
+		// Remove queued skill upon move request.
+		if (player.getQueuedSkill() != null)
+		{
+			player.setQueuedSkill(null, null, false, false);
+		}
+		
 		// Mobius: Check spawn protections.
 		player.onActionRequest();
 	}
diff --git a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java
index 854d89da8d..bce8c05275 100644
--- a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java
+++ b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java
@@ -237,6 +237,12 @@ public class MoveBackwardToLocation implements IClientIncomingPacket
 			}
 		}
 		
+		// Remove queued skill upon move request.
+		if (player.getQueuedSkill() != null)
+		{
+			player.setQueuedSkill(null, null, false, false);
+		}
+		
 		// Mobius: Check spawn protections.
 		player.onActionRequest();
 	}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java
index 854d89da8d..bce8c05275 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java
@@ -237,6 +237,12 @@ public class MoveBackwardToLocation implements IClientIncomingPacket
 			}
 		}
 		
+		// Remove queued skill upon move request.
+		if (player.getQueuedSkill() != null)
+		{
+			player.setQueuedSkill(null, null, false, false);
+		}
+		
 		// Mobius: Check spawn protections.
 		player.onActionRequest();
 	}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java
index 854d89da8d..bce8c05275 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java
@@ -237,6 +237,12 @@ public class MoveBackwardToLocation implements IClientIncomingPacket
 			}
 		}
 		
+		// Remove queued skill upon move request.
+		if (player.getQueuedSkill() != null)
+		{
+			player.setQueuedSkill(null, null, false, false);
+		}
+		
 		// Mobius: Check spawn protections.
 		player.onActionRequest();
 	}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java
index 854d89da8d..bce8c05275 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java
@@ -237,6 +237,12 @@ public class MoveBackwardToLocation implements IClientIncomingPacket
 			}
 		}
 		
+		// Remove queued skill upon move request.
+		if (player.getQueuedSkill() != null)
+		{
+			player.setQueuedSkill(null, null, false, false);
+		}
+		
 		// Mobius: Check spawn protections.
 		player.onActionRequest();
 	}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java
index 854d89da8d..bce8c05275 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java
@@ -237,6 +237,12 @@ public class MoveBackwardToLocation implements IClientIncomingPacket
 			}
 		}
 		
+		// Remove queued skill upon move request.
+		if (player.getQueuedSkill() != null)
+		{
+			player.setQueuedSkill(null, null, false, false);
+		}
+		
 		// Mobius: Check spawn protections.
 		player.onActionRequest();
 	}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java
index 854d89da8d..bce8c05275 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java
@@ -237,6 +237,12 @@ public class MoveBackwardToLocation implements IClientIncomingPacket
 			}
 		}
 		
+		// Remove queued skill upon move request.
+		if (player.getQueuedSkill() != null)
+		{
+			player.setQueuedSkill(null, null, false, false);
+		}
+		
 		// Mobius: Check spawn protections.
 		player.onActionRequest();
 	}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java
index 854d89da8d..bce8c05275 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java
@@ -237,6 +237,12 @@ public class MoveBackwardToLocation implements IClientIncomingPacket
 			}
 		}
 		
+		// Remove queued skill upon move request.
+		if (player.getQueuedSkill() != null)
+		{
+			player.setQueuedSkill(null, null, false, false);
+		}
+		
 		// Mobius: Check spawn protections.
 		player.onActionRequest();
 	}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java
index 854d89da8d..bce8c05275 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java
@@ -237,6 +237,12 @@ public class MoveBackwardToLocation implements IClientIncomingPacket
 			}
 		}
 		
+		// Remove queued skill upon move request.
+		if (player.getQueuedSkill() != null)
+		{
+			player.setQueuedSkill(null, null, false, false);
+		}
+		
 		// Mobius: Check spawn protections.
 		player.onActionRequest();
 	}
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java
index 854d89da8d..bce8c05275 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java
@@ -237,6 +237,12 @@ public class MoveBackwardToLocation implements IClientIncomingPacket
 			}
 		}
 		
+		// Remove queued skill upon move request.
+		if (player.getQueuedSkill() != null)
+		{
+			player.setQueuedSkill(null, null, false, false);
+		}
+		
 		// Mobius: Check spawn protections.
 		player.onActionRequest();
 	}
diff --git a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java
index 854d89da8d..bce8c05275 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java
+++ b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java
@@ -237,6 +237,12 @@ public class MoveBackwardToLocation implements IClientIncomingPacket
 			}
 		}
 		
+		// Remove queued skill upon move request.
+		if (player.getQueuedSkill() != null)
+		{
+			player.setQueuedSkill(null, null, false, false);
+		}
+		
 		// Mobius: Check spawn protections.
 		player.onActionRequest();
 	}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java
index 854d89da8d..bce8c05275 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java
@@ -237,6 +237,12 @@ public class MoveBackwardToLocation implements IClientIncomingPacket
 			}
 		}
 		
+		// Remove queued skill upon move request.
+		if (player.getQueuedSkill() != null)
+		{
+			player.setQueuedSkill(null, null, false, false);
+		}
+		
 		// Mobius: Check spawn protections.
 		player.onActionRequest();
 	}