lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed NPEs from getAI method.

Browse Source 
Contributed by Sahar.
This commit is contained in:
MobiusDevelopment
2019-10-31 19:19:43 +00:00
parent 6a87d283d1
commit f956cf6ed7
18 changed files with 54 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java
+3 -2
View File
@@ -1780,7 +1780,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
*/ */
public CreatureAI getAI() public CreatureAI getAI()
{ {
if (_ai == null) CreatureAI ai = _ai;
if (ai == null)
{ {
synchronized (this) synchronized (this)
{ {
@@ -1790,7 +1791,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
} }
} }
} }
return _ai; return ai;
} }
/** /**
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java
+3 -2
View File
@@ -1780,7 +1780,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
*/ */
public CreatureAI getAI() public CreatureAI getAI()
{ {
if (_ai == null) CreatureAI ai = _ai;
if (ai == null)
{ {
synchronized (this) synchronized (this)
{ {
@@ -1790,7 +1791,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
} }
} }
} }
return _ai; return ai;
} }
/** /**
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java
+3 -2
View File
@@ -1780,7 +1780,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
*/ */
public CreatureAI getAI() public CreatureAI getAI()
{ {
if (_ai == null) CreatureAI ai = _ai;
if (ai == null)
{ {
synchronized (this) synchronized (this)
{ {
@@ -1790,7 +1791,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
} }
} }
} }
return _ai; return ai;
} }
/** /**
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java
+3 -2
View File
@@ -1780,7 +1780,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
*/ */
public CreatureAI getAI() public CreatureAI getAI()
{ {
if (_ai == null) CreatureAI ai = _ai;
if (ai == null)
{ {
synchronized (this) synchronized (this)
{ {
@@ -1790,7 +1791,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
} }
} }
} }
return _ai; return ai;
} }
/** /**
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java
+3 -2
View File
@@ -1780,7 +1780,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
*/ */
public CreatureAI getAI() public CreatureAI getAI()
{ {
if (_ai == null) CreatureAI ai = _ai;
if (ai == null)
{ {
synchronized (this) synchronized (this)
{ {
@@ -1790,7 +1791,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
} }
} }
} }
return _ai; return ai;
} }
/** /**
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java
+3 -2
View File
@@ -1780,7 +1780,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
*/ */
public CreatureAI getAI() public CreatureAI getAI()
{ {
if (_ai == null) CreatureAI ai = _ai;
if (ai == null)
{ {
synchronized (this) synchronized (this)
{ {
@@ -1790,7 +1791,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
} }
} }
} }
return _ai; return ai;
} }
/** /**
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java
+3 -2
View File
@@ -1780,7 +1780,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
*/ */
public CreatureAI getAI() public CreatureAI getAI()
{ {
if (_ai == null) CreatureAI ai = _ai;
if (ai == null)
{ {
synchronized (this) synchronized (this)
{ {
@@ -1790,7 +1791,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
} }
} }
} }
return _ai; return ai;
} }
/** /**
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java
+3 -2
View File
@@ -1780,7 +1780,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
*/ */
public CreatureAI getAI() public CreatureAI getAI()
{ {
if (_ai == null) CreatureAI ai = _ai;
if (ai == null)
{ {
synchronized (this) synchronized (this)
{ {
@@ -1790,7 +1791,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
} }
} }
} }
return _ai; return ai;
} }
/** /**
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java
+3 -3
View File
@@ -2245,7 +2245,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
*/ */
public CreatureAI getAI() public CreatureAI getAI()
{ {
if (_ai == null) CreatureAI ai = _ai;
if (ai == null)
{ {
synchronized (this) synchronized (this)
{ {
@@ -2255,8 +2256,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
} }
} }
} }
return ai;
return _ai;
} }
/** /**
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Creature.java
+3 -2
View File
@@ -2536,7 +2536,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
*/ */
public CreatureAI getAI() public CreatureAI getAI()
{ {
if (_ai == null) CreatureAI ai = _ai;
if (ai == null)
{ {
synchronized (this) synchronized (this)
{ {
@@ -2546,7 +2547,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
} }
} }
} }
return _ai; return ai;
} }
/** /**
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Creature.java
+3 -2
View File
@@ -2538,7 +2538,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
*/ */
public CreatureAI getAI() public CreatureAI getAI()
{ {
if (_ai == null) CreatureAI ai = _ai;
if (ai == null)
{ {
synchronized (this) synchronized (this)
{ {
@@ -2548,7 +2549,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
} }
} }
} }
return _ai; return ai;
} }
/** /**
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java
+3 -2
View File
@@ -1779,7 +1779,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
*/ */
public CreatureAI getAI() public CreatureAI getAI()
{ {
if (_ai == null) CreatureAI ai = _ai;
if (ai == null)
{ {
synchronized (this) synchronized (this)
{ {
@@ -1789,7 +1790,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
} }
} }
} }
return _ai; return ai;
} }
/** /**
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java
+3 -2
View File
@@ -1779,7 +1779,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
*/ */
public CreatureAI getAI() public CreatureAI getAI()
{ {
if (_ai == null) CreatureAI ai = _ai;
if (ai == null)
{ {
synchronized (this) synchronized (this)
{ {
@@ -1789,7 +1790,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
} }
} }
} }
return _ai; return ai;
} }
/** /**
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java
+3 -2
View File
@@ -1779,7 +1779,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
*/ */
public CreatureAI getAI() public CreatureAI getAI()
{ {
if (_ai == null) CreatureAI ai = _ai;
if (ai == null)
{ {
synchronized (this) synchronized (this)
{ {
@@ -1789,7 +1790,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
} }
} }
} }
return _ai; return ai;
} }
/** /**
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java
+3 -2
View File
@@ -1780,7 +1780,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
*/ */
public CreatureAI getAI() public CreatureAI getAI()
{ {
if (_ai == null) CreatureAI ai = _ai;
if (ai == null)
{ {
synchronized (this) synchronized (this)
{ {
@@ -1790,7 +1791,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
} }
} }
} }
return _ai; return ai;
} }
/** /**
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java
+3 -2
View File
@@ -1780,7 +1780,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
*/ */
public CreatureAI getAI() public CreatureAI getAI()
{ {
if (_ai == null) CreatureAI ai = _ai;
if (ai == null)
{ {
synchronized (this) synchronized (this)
{ {
@@ -1790,7 +1791,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
} }
} }
} }
return _ai; return ai;
} }
/** /**
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java
+3 -2
View File
@@ -1780,7 +1780,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
*/ */
public CreatureAI getAI() public CreatureAI getAI()
{ {
if (_ai == null) CreatureAI ai = _ai;
if (ai == null)
{ {
synchronized (this) synchronized (this)
{ {
@@ -1790,7 +1791,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
} }
} }
} }
return _ai; return ai;
} }
/** /**
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java
+3 -2
View File
@@ -1779,7 +1779,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
*/ */
public CreatureAI getAI() public CreatureAI getAI()
{ {
if (_ai == null) CreatureAI ai = _ai;
if (ai == null)
{ {
synchronized (this) synchronized (this)
{ {
@@ -1789,7 +1790,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
} }
} }
} }
return _ai; return ai;
} }
/** /**