Fixed aggressive minions after respawn.

L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/MinionList.java

@@ -23,6 +23,7 @@ import java.util.concurrent.ScheduledFuture;
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.concurrent.ThreadPool;
 import org.l2jmobius.commons.util.Rnd;
+import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.data.xml.impl.NpcData;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.actor.Creature;
@@ -249,6 +250,13 @@ public class MinionList
 			{
 				_minion.refreshID();
 				initializeNpcInstance(_master, _minion);
+				
+				// assist master
+				if (!_master.getAggroList().isEmpty())
+				{
+					_minion.getAggroList().putAll(_master.getAggroList());
+					_minion.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, _minion.getAggroList().keySet().stream().findFirst().get());
+				}
 			}
 		}
 	}

L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/MinionList.java

@@ -23,6 +23,7 @@ import java.util.concurrent.ScheduledFuture;
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.concurrent.ThreadPool;
 import org.l2jmobius.commons.util.Rnd;
+import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.data.xml.impl.NpcData;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.actor.Creature;
@@ -249,6 +250,13 @@ public class MinionList
 			{
 				_minion.refreshID();
 				initializeNpcInstance(_master, _minion);
+				
+				// assist master
+				if (!_master.getAggroList().isEmpty())
+				{
+					_minion.getAggroList().putAll(_master.getAggroList());
+					_minion.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, _minion.getAggroList().keySet().stream().findFirst().get());
+				}
 			}
 		}
 	}

L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/MinionList.java

@@ -23,6 +23,7 @@ import java.util.concurrent.ScheduledFuture;
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.concurrent.ThreadPool;
 import org.l2jmobius.commons.util.Rnd;
+import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.data.xml.impl.NpcData;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.actor.Creature;
@@ -249,6 +250,13 @@ public class MinionList
 			{
 				_minion.refreshID();
 				initializeNpcInstance(_master, _minion);
+				
+				// assist master
+				if (!_master.getAggroList().isEmpty())
+				{
+					_minion.getAggroList().putAll(_master.getAggroList());
+					_minion.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, _minion.getAggroList().keySet().stream().findFirst().get());
+				}
 			}
 		}
 	}

L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/MinionList.java

@@ -23,6 +23,7 @@ import java.util.concurrent.ScheduledFuture;
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.concurrent.ThreadPool;
 import org.l2jmobius.commons.util.Rnd;
+import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.data.xml.impl.NpcData;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.actor.Creature;
@@ -249,6 +250,13 @@ public class MinionList
 			{
 				_minion.refreshID();
 				initializeNpcInstance(_master, _minion);
+				
+				// assist master
+				if (!_master.getAggroList().isEmpty())
+				{
+					_minion.getAggroList().putAll(_master.getAggroList());
+					_minion.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, _minion.getAggroList().keySet().stream().findFirst().get());
+				}
 			}
 		}
 	}

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/MinionList.java

@@ -23,6 +23,7 @@ import java.util.concurrent.ScheduledFuture;
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.concurrent.ThreadPool;
 import org.l2jmobius.commons.util.Rnd;
+import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.data.xml.impl.NpcData;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.actor.Creature;
@@ -249,6 +250,13 @@ public class MinionList
 			{
 				_minion.refreshID();
 				initializeNpcInstance(_master, _minion);
+				
+				// assist master
+				if (!_master.getAggroList().isEmpty())
+				{
+					_minion.getAggroList().putAll(_master.getAggroList());
+					_minion.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, _minion.getAggroList().keySet().stream().findFirst().get());
+				}
 			}
 		}
 	}

L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/MinionList.java

@@ -23,6 +23,7 @@ import java.util.concurrent.ScheduledFuture;
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.concurrent.ThreadPool;
 import org.l2jmobius.commons.util.Rnd;
+import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.data.xml.impl.NpcData;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.actor.Creature;
@@ -249,6 +250,13 @@ public class MinionList
 			{
 				_minion.refreshID();
 				initializeNpcInstance(_master, _minion);
+				
+				// assist master
+				if (!_master.getAggroList().isEmpty())
+				{
+					_minion.getAggroList().putAll(_master.getAggroList());
+					_minion.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, _minion.getAggroList().keySet().stream().findFirst().get());
+				}
 			}
 		}
 	}

L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/MinionList.java

@@ -23,6 +23,7 @@ import java.util.concurrent.ScheduledFuture;
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.concurrent.ThreadPool;
 import org.l2jmobius.commons.util.Rnd;
+import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.data.xml.impl.NpcData;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.actor.Creature;
@@ -249,6 +250,13 @@ public class MinionList
 			{
 				_minion.refreshID();
 				initializeNpcInstance(_master, _minion);
+				
+				// assist master
+				if (!_master.getAggroList().isEmpty())
+				{
+					_minion.getAggroList().putAll(_master.getAggroList());
+					_minion.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, _minion.getAggroList().keySet().stream().findFirst().get());
+				}
 			}
 		}
 	}

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/MinionList.java

@@ -23,6 +23,7 @@ import java.util.concurrent.ScheduledFuture;
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.concurrent.ThreadPool;
 import org.l2jmobius.commons.util.Rnd;
+import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.data.xml.impl.NpcData;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.actor.Creature;
@@ -249,6 +250,13 @@ public class MinionList
 			{
 				_minion.refreshID();
 				initializeNpcInstance(_master, _minion);
+				
+				// assist master
+				if (!_master.getAggroList().isEmpty())
+				{
+					_minion.getAggroList().putAll(_master.getAggroList());
+					_minion.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, _minion.getAggroList().keySet().stream().findFirst().get());
+				}
 			}
 		}
 	}

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/util/MinionList.java

@@ -26,6 +26,7 @@ import java.util.concurrent.ConcurrentHashMap;
 
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.util.Rnd;
+import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.datatables.sql.NpcTable;
 import org.l2jmobius.gameserver.idfactory.IdFactory;
 import org.l2jmobius.gameserver.model.MinionData;
@@ -256,5 +257,12 @@ public class MinionList
 		final int newY = master.getY() + spawnConstant;
 		
 		monster.spawnMe(newX, newY, master.getZ());
+		
+		// Assist master
+		if (!master.getAggroList().isEmpty())
+		{
+			monster.getAggroList().putAll(master.getAggroList());
+			monster.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, monster.getAggroList().keySet().stream().findFirst().get());
+		}
 	}
 }

L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/MinionList.java

@@ -23,6 +23,7 @@ import java.util.concurrent.ScheduledFuture;
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.concurrent.ThreadPool;
 import org.l2jmobius.commons.util.Rnd;
+import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.data.xml.impl.NpcData;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.actor.Creature;
@@ -249,6 +250,13 @@ public class MinionList
 			{
 				_minion.refreshID();
 				initializeNpcInstance(_master, _minion);
+				
+				// assist master
+				if (!_master.getAggroList().isEmpty())
+				{
+					_minion.getAggroList().putAll(_master.getAggroList());
+					_minion.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, _minion.getAggroList().keySet().stream().findFirst().get());
+				}
 			}
 		}
 	}

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/MinionList.java

@@ -23,6 +23,7 @@ import java.util.concurrent.ScheduledFuture;
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.concurrent.ThreadPool;
 import org.l2jmobius.commons.util.Rnd;
+import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.data.xml.impl.NpcData;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.actor.Creature;
@@ -249,6 +250,13 @@ public class MinionList
 			{
 				_minion.refreshID();
 				initializeNpcInstance(_master, _minion);
+				
+				// assist master
+				if (!_master.getAggroList().isEmpty())
+				{
+					_minion.getAggroList().putAll(_master.getAggroList());
+					_minion.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, _minion.getAggroList().keySet().stream().findFirst().get());
+				}
 			}
 		}
 	}

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/MinionList.java

@@ -23,6 +23,7 @@ import java.util.concurrent.ScheduledFuture;
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.concurrent.ThreadPool;
 import org.l2jmobius.commons.util.Rnd;
+import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.data.xml.impl.NpcData;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.actor.Creature;
@@ -249,6 +250,13 @@ public class MinionList
 			{
 				_minion.refreshID();
 				initializeNpcInstance(_master, _minion);
+				
+				// assist master
+				if (!_master.getAggroList().isEmpty())
+				{
+					_minion.getAggroList().putAll(_master.getAggroList());
+					_minion.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, _minion.getAggroList().keySet().stream().findFirst().get());
+				}
 			}
 		}
 	}

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/MinionList.java

@@ -23,6 +23,7 @@ import java.util.concurrent.ScheduledFuture;
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.concurrent.ThreadPool;
 import org.l2jmobius.commons.util.Rnd;
+import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.data.xml.impl.NpcData;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.actor.Creature;
@@ -249,6 +250,13 @@ public class MinionList
 			{
 				_minion.refreshID();
 				initializeNpcInstance(_master, _minion);
+				
+				// assist master
+				if (!_master.getAggroList().isEmpty())
+				{
+					_minion.getAggroList().putAll(_master.getAggroList());
+					_minion.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, _minion.getAggroList().keySet().stream().findFirst().get());
+				}
 			}
 		}
 	}

L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/MinionList.java

@@ -23,6 +23,7 @@ import java.util.concurrent.ScheduledFuture;
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.concurrent.ThreadPool;
 import org.l2jmobius.commons.util.Rnd;
+import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.data.xml.impl.NpcData;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.actor.Creature;
@@ -249,6 +250,13 @@ public class MinionList
 			{
 				_minion.refreshID();
 				initializeNpcInstance(_master, _minion);
+				
+				// assist master
+				if (!_master.getAggroList().isEmpty())
+				{
+					_minion.getAggroList().putAll(_master.getAggroList());
+					_minion.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, _minion.getAggroList().keySet().stream().findFirst().get());
+				}
 			}
 		}
 	}

L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/MinionList.java

@@ -23,6 +23,7 @@ import java.util.concurrent.ScheduledFuture;
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.concurrent.ThreadPool;
 import org.l2jmobius.commons.util.Rnd;
+import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.data.xml.impl.NpcData;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.actor.Creature;
@@ -249,6 +250,13 @@ public class MinionList
 			{
 				_minion.refreshID();
 				initializeNpcInstance(_master, _minion);
+				
+				// assist master
+				if (!_master.getAggroList().isEmpty())
+				{
+					_minion.getAggroList().putAll(_master.getAggroList());
+					_minion.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, _minion.getAggroList().keySet().stream().findFirst().get());
+				}
 			}
 		}
 	}

L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/MinionList.java

@@ -23,6 +23,7 @@ import java.util.concurrent.ScheduledFuture;
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.concurrent.ThreadPool;
 import org.l2jmobius.commons.util.Rnd;
+import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.data.xml.impl.NpcData;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.actor.Creature;
@@ -249,6 +250,13 @@ public class MinionList
 			{
 				_minion.refreshID();
 				initializeNpcInstance(_master, _minion);
+				
+				// assist master
+				if (!_master.getAggroList().isEmpty())
+				{
+					_minion.getAggroList().putAll(_master.getAggroList());
+					_minion.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, _minion.getAggroList().keySet().stream().findFirst().get());
+				}
 			}
 		}
 	}

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/MinionList.java

@@ -23,6 +23,7 @@ import java.util.concurrent.ScheduledFuture;
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.concurrent.ThreadPool;
 import org.l2jmobius.commons.util.Rnd;
+import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.data.xml.impl.NpcData;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.actor.Creature;
@@ -249,6 +250,13 @@ public class MinionList
 			{
 				_minion.refreshID();
 				initializeNpcInstance(_master, _minion);
+				
+				// assist master
+				if (!_master.getAggroList().isEmpty())
+				{
+					_minion.getAggroList().putAll(_master.getAggroList());
+					_minion.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, _minion.getAggroList().keySet().stream().findFirst().get());
+				}
 			}
 		}
 	}

L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/MinionList.java

@@ -23,6 +23,7 @@ import java.util.concurrent.ScheduledFuture;
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.concurrent.ThreadPool;
 import org.l2jmobius.commons.util.Rnd;
+import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.data.xml.impl.NpcData;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.actor.Creature;
@@ -249,6 +250,13 @@ public class MinionList
 			{
 				_minion.refreshID();
 				initializeNpcInstance(_master, _minion);
+				
+				// assist master
+				if (!_master.getAggroList().isEmpty())
+				{
+					_minion.getAggroList().putAll(_master.getAggroList());
+					_minion.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, _minion.getAggroList().keySet().stream().findFirst().get());
+				}
 			}
 		}
 	}