Stop attacking admin when using invisible.

Contributed by facab.

L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java

@@ -19,6 +19,7 @@ package handlers.admincommandhandlers;
 import java.util.Arrays;
 import java.util.StringTokenizer;
 
+import com.l2jmobius.gameserver.ai.CtrlIntention;
 import com.l2jmobius.gameserver.enums.Movie;
 import com.l2jmobius.gameserver.enums.Team;
 import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
@@ -125,6 +126,16 @@ public class AdminEffects implements IAdminCommandHandler
 				activeChar.setInvisible(true);
 				activeChar.broadcastUserInfo();
 				activeChar.sendPacket(new ExUserInfoAbnormalVisualEffect(activeChar));
+				L2World.getInstance().forEachVisibleObject(activeChar, L2Character.class, target ->
+				{
+					if ((target != null) && (target.getTarget() == activeChar))
+					{
+						target.setTarget(null);
+						target.abortAttack();
+						target.abortCast();
+						target.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
+					}
+				});
 				BuilderUtil.sendSysMessage(activeChar, "Now, you cannot be seen.");
 			}
 			else
@@ -144,6 +155,16 @@ public class AdminEffects implements IAdminCommandHandler
 			activeChar.setInvisible(true);
 			activeChar.broadcastUserInfo();
 			activeChar.sendPacket(new ExUserInfoAbnormalVisualEffect(activeChar));
+			L2World.getInstance().forEachVisibleObject(activeChar, L2Character.class, target ->
+			{
+				if ((target != null) && (target.getTarget() == activeChar))
+				{
+					target.setTarget(null);
+					target.abortAttack();
+					target.abortCast();
+					target.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
+				}
+			});
 			BuilderUtil.sendSysMessage(activeChar, "Now, you cannot be seen.");
 		}
 		else if (command.startsWith("admin_vis"))

L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java

@@ -19,6 +19,7 @@ package handlers.admincommandhandlers;
 import java.util.Arrays;
 import java.util.StringTokenizer;
 
+import com.l2jmobius.gameserver.ai.CtrlIntention;
 import com.l2jmobius.gameserver.enums.Movie;
 import com.l2jmobius.gameserver.enums.Team;
 import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
@@ -125,6 +126,16 @@ public class AdminEffects implements IAdminCommandHandler
 				activeChar.setInvisible(true);
 				activeChar.broadcastUserInfo();
 				activeChar.sendPacket(new ExUserInfoAbnormalVisualEffect(activeChar));
+				L2World.getInstance().forEachVisibleObject(activeChar, L2Character.class, target ->
+				{
+					if ((target != null) && (target.getTarget() == activeChar))
+					{
+						target.setTarget(null);
+						target.abortAttack();
+						target.abortCast();
+						target.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
+					}
+				});
 				BuilderUtil.sendSysMessage(activeChar, "Now, you cannot be seen.");
 			}
 			else
@@ -144,6 +155,16 @@ public class AdminEffects implements IAdminCommandHandler
 			activeChar.setInvisible(true);
 			activeChar.broadcastUserInfo();
 			activeChar.sendPacket(new ExUserInfoAbnormalVisualEffect(activeChar));
+			L2World.getInstance().forEachVisibleObject(activeChar, L2Character.class, target ->
+			{
+				if ((target != null) && (target.getTarget() == activeChar))
+				{
+					target.setTarget(null);
+					target.abortAttack();
+					target.abortCast();
+					target.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
+				}
+			});
 			BuilderUtil.sendSysMessage(activeChar, "Now, you cannot be seen.");
 		}
 		else if (command.startsWith("admin_vis"))

L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java

@@ -19,6 +19,7 @@ package handlers.admincommandhandlers;
 import java.util.Arrays;
 import java.util.StringTokenizer;
 
+import com.l2jmobius.gameserver.ai.CtrlIntention;
 import com.l2jmobius.gameserver.enums.Movie;
 import com.l2jmobius.gameserver.enums.Team;
 import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
@@ -125,6 +126,16 @@ public class AdminEffects implements IAdminCommandHandler
 				activeChar.setInvisible(true);
 				activeChar.broadcastUserInfo();
 				activeChar.sendPacket(new ExUserInfoAbnormalVisualEffect(activeChar));
+				L2World.getInstance().forEachVisibleObject(activeChar, L2Character.class, target ->
+				{
+					if ((target != null) && (target.getTarget() == activeChar))
+					{
+						target.setTarget(null);
+						target.abortAttack();
+						target.abortCast();
+						target.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
+					}
+				});
 				BuilderUtil.sendSysMessage(activeChar, "Now, you cannot be seen.");
 			}
 			else
@@ -144,6 +155,16 @@ public class AdminEffects implements IAdminCommandHandler
 			activeChar.setInvisible(true);
 			activeChar.broadcastUserInfo();
 			activeChar.sendPacket(new ExUserInfoAbnormalVisualEffect(activeChar));
+			L2World.getInstance().forEachVisibleObject(activeChar, L2Character.class, target ->
+			{
+				if ((target != null) && (target.getTarget() == activeChar))
+				{
+					target.setTarget(null);
+					target.abortAttack();
+					target.abortCast();
+					target.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
+				}
+			});
 			BuilderUtil.sendSysMessage(activeChar, "Now, you cannot be seen.");
 		}
 		else if (command.startsWith("admin_vis"))

L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java

@@ -19,6 +19,7 @@ package handlers.admincommandhandlers;
 import java.util.Arrays;
 import java.util.StringTokenizer;
 
+import com.l2jmobius.gameserver.ai.CtrlIntention;
 import com.l2jmobius.gameserver.enums.Movie;
 import com.l2jmobius.gameserver.enums.Team;
 import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
@@ -125,6 +126,16 @@ public class AdminEffects implements IAdminCommandHandler
 				activeChar.setInvisible(true);
 				activeChar.broadcastUserInfo();
 				activeChar.sendPacket(new ExUserInfoAbnormalVisualEffect(activeChar));
+				L2World.getInstance().forEachVisibleObject(activeChar, L2Character.class, target ->
+				{
+					if ((target != null) && (target.getTarget() == activeChar))
+					{
+						target.setTarget(null);
+						target.abortAttack();
+						target.abortCast();
+						target.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
+					}
+				});
 				BuilderUtil.sendSysMessage(activeChar, "Now, you cannot be seen.");
 			}
 			else
@@ -144,6 +155,16 @@ public class AdminEffects implements IAdminCommandHandler
 			activeChar.setInvisible(true);
 			activeChar.broadcastUserInfo();
 			activeChar.sendPacket(new ExUserInfoAbnormalVisualEffect(activeChar));
+			L2World.getInstance().forEachVisibleObject(activeChar, L2Character.class, target ->
+			{
+				if ((target != null) && (target.getTarget() == activeChar))
+				{
+					target.setTarget(null);
+					target.abortAttack();
+					target.abortCast();
+					target.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
+				}
+			});
 			BuilderUtil.sendSysMessage(activeChar, "Now, you cannot be seen.");
 		}
 		else if (command.startsWith("admin_vis"))

L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java

@@ -18,6 +18,7 @@ package handlers.admincommandhandlers;
 
 import java.util.StringTokenizer;
 
+import com.l2jmobius.gameserver.ai.CtrlIntention;
 import com.l2jmobius.gameserver.enums.Team;
 import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import com.l2jmobius.gameserver.model.L2Object;
@@ -114,8 +115,16 @@ public class AdminEffects implements IAdminCommandHandler
 			{
 				activeChar.setInvisible(true);
 				activeChar.broadcastUserInfo();
-				activeChar.decayMe();
+				L2World.getInstance().forEachVisibleObject(activeChar, L2Character.class, target ->
-				activeChar.spawnMe();
+				{
+					if ((target != null) && (target.getTarget() == activeChar))
+					{
+						target.setTarget(null);
+						target.abortAttack();
+						target.abortCast();
+						target.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
+					}
+				});
 				BuilderUtil.sendSysMessage(activeChar, "Now, you cannot be seen.");
 			}
 			else
@@ -132,8 +141,16 @@ public class AdminEffects implements IAdminCommandHandler
 		{
 			activeChar.setInvisible(true);
 			activeChar.broadcastUserInfo();
-			activeChar.decayMe();
+			L2World.getInstance().forEachVisibleObject(activeChar, L2Character.class, target ->
-			activeChar.spawnMe();
+			{
+				if ((target != null) && (target.getTarget() == activeChar))
+				{
+					target.setTarget(null);
+					target.abortAttack();
+					target.abortCast();
+					target.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
+				}
+			});
 			BuilderUtil.sendSysMessage(activeChar, "Now, you cannot be seen.");
 		}
 		else if (command.startsWith("admin_vis"))

L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java

@@ -19,6 +19,7 @@ package handlers.admincommandhandlers;
 import java.util.Arrays;
 import java.util.StringTokenizer;
 
+import com.l2jmobius.gameserver.ai.CtrlIntention;
 import com.l2jmobius.gameserver.enums.Movie;
 import com.l2jmobius.gameserver.enums.Team;
 import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
@@ -125,6 +126,16 @@ public class AdminEffects implements IAdminCommandHandler
 				activeChar.setInvisible(true);
 				activeChar.broadcastUserInfo();
 				activeChar.sendPacket(new ExUserInfoAbnormalVisualEffect(activeChar));
+				L2World.getInstance().forEachVisibleObject(activeChar, L2Character.class, target ->
+				{
+					if ((target != null) && (target.getTarget() == activeChar))
+					{
+						target.setTarget(null);
+						target.abortAttack();
+						target.abortCast();
+						target.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
+					}
+				});
 				BuilderUtil.sendSysMessage(activeChar, "Now, you cannot be seen.");
 			}
 			else
@@ -144,6 +155,16 @@ public class AdminEffects implements IAdminCommandHandler
 			activeChar.setInvisible(true);
 			activeChar.broadcastUserInfo();
 			activeChar.sendPacket(new ExUserInfoAbnormalVisualEffect(activeChar));
+			L2World.getInstance().forEachVisibleObject(activeChar, L2Character.class, target ->
+			{
+				if ((target != null) && (target.getTarget() == activeChar))
+				{
+					target.setTarget(null);
+					target.abortAttack();
+					target.abortCast();
+					target.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
+				}
+			});
 			BuilderUtil.sendSysMessage(activeChar, "Now, you cannot be seen.");
 		}
 		else if (command.startsWith("admin_vis"))

L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java

@@ -19,6 +19,7 @@ package handlers.admincommandhandlers;
 import java.util.Arrays;
 import java.util.StringTokenizer;
 
+import com.l2jmobius.gameserver.ai.CtrlIntention;
 import com.l2jmobius.gameserver.enums.Movie;
 import com.l2jmobius.gameserver.enums.Team;
 import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
@@ -125,6 +126,16 @@ public class AdminEffects implements IAdminCommandHandler
 				activeChar.setInvisible(true);
 				activeChar.broadcastUserInfo();
 				activeChar.sendPacket(new ExUserInfoAbnormalVisualEffect(activeChar));
+				L2World.getInstance().forEachVisibleObject(activeChar, L2Character.class, target ->
+				{
+					if ((target != null) && (target.getTarget() == activeChar))
+					{
+						target.setTarget(null);
+						target.abortAttack();
+						target.abortCast();
+						target.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
+					}
+				});
 				BuilderUtil.sendSysMessage(activeChar, "Now, you cannot be seen.");
 			}
 			else
@@ -144,6 +155,16 @@ public class AdminEffects implements IAdminCommandHandler
 			activeChar.setInvisible(true);
 			activeChar.broadcastUserInfo();
 			activeChar.sendPacket(new ExUserInfoAbnormalVisualEffect(activeChar));
+			L2World.getInstance().forEachVisibleObject(activeChar, L2Character.class, target ->
+			{
+				if ((target != null) && (target.getTarget() == activeChar))
+				{
+					target.setTarget(null);
+					target.abortAttack();
+					target.abortCast();
+					target.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
+				}
+			});
 			BuilderUtil.sendSysMessage(activeChar, "Now, you cannot be seen.");
 		}
 		else if (command.startsWith("admin_vis"))

L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java

@@ -19,6 +19,7 @@ package handlers.admincommandhandlers;
 import java.util.Arrays;
 import java.util.StringTokenizer;
 
+import com.l2jmobius.gameserver.ai.CtrlIntention;
 import com.l2jmobius.gameserver.enums.Movie;
 import com.l2jmobius.gameserver.enums.Team;
 import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
@@ -125,6 +126,16 @@ public class AdminEffects implements IAdminCommandHandler
 				activeChar.setInvisible(true);
 				activeChar.broadcastUserInfo();
 				activeChar.sendPacket(new ExUserInfoAbnormalVisualEffect(activeChar));
+				L2World.getInstance().forEachVisibleObject(activeChar, L2Character.class, target ->
+				{
+					if ((target != null) && (target.getTarget() == activeChar))
+					{
+						target.setTarget(null);
+						target.abortAttack();
+						target.abortCast();
+						target.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
+					}
+				});
 				BuilderUtil.sendSysMessage(activeChar, "Now, you cannot be seen.");
 			}
 			else
@@ -144,6 +155,16 @@ public class AdminEffects implements IAdminCommandHandler
 			activeChar.setInvisible(true);
 			activeChar.broadcastUserInfo();
 			activeChar.sendPacket(new ExUserInfoAbnormalVisualEffect(activeChar));
+			L2World.getInstance().forEachVisibleObject(activeChar, L2Character.class, target ->
+			{
+				if ((target != null) && (target.getTarget() == activeChar))
+				{
+					target.setTarget(null);
+					target.abortAttack();
+					target.abortCast();
+					target.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
+				}
+			});
 			BuilderUtil.sendSysMessage(activeChar, "Now, you cannot be seen.");
 		}
 		else if (command.startsWith("admin_vis"))