Fixed NPEs from getAI method.

Contributed by Sahar.
2019-10-31 19:19:43 +00:00
parent 6a87d283d1
commit f956cf6ed7
18 changed files with 54 additions and 37 deletions
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -2536,7 +2536,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 */
 	public CreatureAI getAI()
 	{
-		if (_ai == null)
+		CreatureAI ai = _ai;
+		if (ai == null)
 		{
 			synchronized (this)
 			{
@@ -2546,7 +2547,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 				}
 			}
 		}
-		return _ai;
+		return ai;
 	}
 	
 	/**