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

World object null checks.

Browse Source
This commit is contained in:
MobiusDevelopment 2020-09-04 18:50:00 +00:00
parent f8411b953e
commit 0ec7e382dd
38 changed files with 321 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/World.java
View File

@ -413,7 +413,7 @@ public class World
for (int j = 0; j < visibleObjects.size(); j++)
{
final WorldObject wo = visibleObjects.get(j);
if (wo == object)
if ((wo == null) || (wo == object))
{
continue;
}
@ -482,7 +482,7 @@ public class World
for (int j = 0; j < visibleObjects.size(); j++)
{
final WorldObject wo = visibleObjects.get(j);
if (wo == object)
if ((wo == null) || (wo == object))
{
continue;
}
@ -542,7 +542,7 @@ public class World
for (int j = 0; j < visibleObjects.size(); j++)
{
final WorldObject wo = visibleObjects.get(j);
if ((wo == object) || (wo.getInstanceWorld() != object.getInstanceWorld()))
if ((wo == null) || (wo == object) || (wo.getInstanceWorld() != object.getInstanceWorld()))
{
continue;
}

13
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/WorldRegion.java
View File

@ -55,6 +55,11 @@ public class WorldRegion
for (int i = 0; i < _visibleObjects.size(); i++)
{
final WorldObject wo = _visibleObjects.get(i);
if (wo == null)
{
continue;
}
if (wo.isAttackable())
{
final Attackable mob = (Attackable) wo;
@ -91,6 +96,11 @@ public class WorldRegion
for (int i = 0; i < _visibleObjects.size(); i++)
{
final WorldObject wo = _visibleObjects.get(i);
if (wo == null)
{
continue;
}
if (wo.isAttackable())
{
// Start HP/MP/CP regeneration task.
@ -120,7 +130,8 @@ public class WorldRegion
final List<WorldObject> regionObjects = worldRegion.getVisibleObjects();
for (int j = 0; j < regionObjects.size(); j++)
{
if (regionObjects.get(j).isPlayable())
final WorldObject wo = regionObjects.get(j);
if ((wo != null) && wo.isPlayable())
{
return false;
}

6
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/World.java
View File

@ -413,7 +413,7 @@ public class World
for (int j = 0; j < visibleObjects.size(); j++)
{
final WorldObject wo = visibleObjects.get(j);
if (wo == object)
if ((wo == null) || (wo == object))
{
continue;
}
@ -482,7 +482,7 @@ public class World
for (int j = 0; j < visibleObjects.size(); j++)
{
final WorldObject wo = visibleObjects.get(j);
if (wo == object)
if ((wo == null) || (wo == object))
{
continue;
}
@ -542,7 +542,7 @@ public class World
for (int j = 0; j < visibleObjects.size(); j++)
{
final WorldObject wo = visibleObjects.get(j);
if ((wo == object) || (wo.getInstanceWorld() != object.getInstanceWorld()))
if ((wo == null) || (wo == object) || (wo.getInstanceWorld() != object.getInstanceWorld()))
{
continue;
}

13
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/WorldRegion.java
View File

@ -55,6 +55,11 @@ public class WorldRegion
for (int i = 0; i < _visibleObjects.size(); i++)
{
final WorldObject wo = _visibleObjects.get(i);
if (wo == null)
{
continue;
}
if (wo.isAttackable())
{
final Attackable mob = (Attackable) wo;
@ -91,6 +96,11 @@ public class WorldRegion
for (int i = 0; i < _visibleObjects.size(); i++)
{
final WorldObject wo = _visibleObjects.get(i);
if (wo == null)
{
continue;
}
if (wo.isAttackable())
{
// Start HP/MP/CP regeneration task.
@ -120,7 +130,8 @@ public class WorldRegion
final List<WorldObject> regionObjects = worldRegion.getVisibleObjects();
for (int j = 0; j < regionObjects.size(); j++)
{
if (regionObjects.get(j).isPlayable())
final WorldObject wo = regionObjects.get(j);
if ((wo != null) && wo.isPlayable())
{
return false;
}

6
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/World.java
View File

@ -413,7 +413,7 @@ public class World
for (int j = 0; j < visibleObjects.size(); j++)
{
final WorldObject wo = visibleObjects.get(j);
if (wo == object)
if ((wo == null) || (wo == object))
{
continue;
}
@ -482,7 +482,7 @@ public class World
for (int j = 0; j < visibleObjects.size(); j++)
{
final WorldObject wo = visibleObjects.get(j);
if (wo == object)
if ((wo == null) || (wo == object))
{
continue;
}
@ -542,7 +542,7 @@ public class World
for (int j = 0; j < visibleObjects.size(); j++)
{
final WorldObject wo = visibleObjects.get(j);
if ((wo == object) || (wo.getInstanceWorld() != object.getInstanceWorld()))
if ((wo == null) || (wo == object) || (wo.getInstanceWorld() != object.getInstanceWorld()))
{
continue;
}

13
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/WorldRegion.java
View File

@ -55,6 +55,11 @@ public class WorldRegion
for (int i = 0; i < _visibleObjects.size(); i++)
{
final WorldObject wo = _visibleObjects.get(i);
if (wo == null)
{
continue;
}
if (wo.isAttackable())
{
final Attackable mob = (Attackable) wo;
@ -91,6 +96,11 @@ public class WorldRegion
for (int i = 0; i < _visibleObjects.size(); i++)
{
final WorldObject wo = _visibleObjects.get(i);
if (wo == null)
{
continue;
}
if (wo.isAttackable())
{
// Start HP/MP/CP regeneration task.
@ -120,7 +130,8 @@ public class WorldRegion
final List<WorldObject> regionObjects = worldRegion.getVisibleObjects();
for (int j = 0; j < regionObjects.size(); j++)
{
if (regionObjects.get(j).isPlayable())
final WorldObject wo = regionObjects.get(j);
if ((wo != null) && wo.isPlayable())
{
return false;
}

6
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/World.java
View File

@ -413,7 +413,7 @@ public class World
for (int j = 0; j < visibleObjects.size(); j++)
{
final WorldObject wo = visibleObjects.get(j);
if (wo == object)
if ((wo == null) || (wo == object))
{
continue;
}
@ -482,7 +482,7 @@ public class World
for (int j = 0; j < visibleObjects.size(); j++)
{
final WorldObject wo = visibleObjects.get(j);
if (wo == object)
if ((wo == null) || (wo == object))
{
continue;
}
@ -542,7 +542,7 @@ public class World
for (int j = 0; j < visibleObjects.size(); j++)
{
final WorldObject wo = visibleObjects.get(j);
if ((wo == object) || (wo.getInstanceWorld() != object.getInstanceWorld()))
if ((wo == null) || (wo == object) || (wo.getInstanceWorld() != object.getInstanceWorld()))
{
continue;
}

13
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/WorldRegion.java
View File

@ -55,6 +55,11 @@ public class WorldRegion
for (int i = 0; i < _visibleObjects.size(); i++)
{
final WorldObject wo = _visibleObjects.get(i);
if (wo == null)
{
continue;
}
if (wo.isAttackable())
{
final Attackable mob = (Attackable) wo;
@ -91,6 +96,11 @@ public class WorldRegion
for (int i = 0; i < _visibleObjects.size(); i++)
{
final WorldObject wo = _visibleObjects.get(i);
if (wo == null)
{
continue;
}
if (wo.isAttackable())
{
// Start HP/MP/CP regeneration task.
@ -120,7 +130,8 @@ public class WorldRegion
final List<WorldObject> regionObjects = worldRegion.getVisibleObjects();
for (int j = 0; j < regionObjects.size(); j++)
{
if (regionObjects.get(j).isPlayable())
final WorldObject wo = regionObjects.get(j);
if ((wo != null) && wo.isPlayable())
{
return false;
}

6
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/World.java
View File

@ -413,7 +413,7 @@ public class World
for (int j = 0; j < visibleObjects.size(); j++)
{
final WorldObject wo = visibleObjects.get(j);
if (wo == object)
if ((wo == null) || (wo == object))
{
continue;
}
@ -482,7 +482,7 @@ public class World
for (int j = 0; j < visibleObjects.size(); j++)
{
final WorldObject wo = visibleObjects.get(j);
if (wo == object)
if ((wo == null) || (wo == object))
{
continue;
}
@ -542,7 +542,7 @@ public class World
for (int j = 0; j < visibleObjects.size(); j++)
{
final WorldObject wo = visibleObjects.get(j);
if ((wo == object) || (wo.getInstanceWorld() != object.getInstanceWorld()))
if ((wo == null) || (wo == object) || (wo.getInstanceWorld() != object.getInstanceWorld()))
{
continue;
}

13
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/WorldRegion.java
View File

@ -55,6 +55,11 @@ public class WorldRegion
for (int i = 0; i < _visibleObjects.size(); i++)
{
final WorldObject wo = _visibleObjects.get(i);
if (wo == null)
{
continue;
}
if (wo.isAttackable())
{
final Attackable mob = (Attackable) wo;
@ -91,6 +96,11 @@ public class WorldRegion
for (int i = 0; i < _visibleObjects.size(); i++)
{
final WorldObject wo = _visibleObjects.get(i);
if (wo == null)
{
continue;
}
if (wo.isAttackable())
{
// Start HP/MP/CP regeneration task.
@ -120,7 +130,8 @@ public class WorldRegion
final List<WorldObject> regionObjects = worldRegion.getVisibleObjects();
for (int j = 0; j < regionObjects.size(); j++)
{
if (regionObjects.get(j).isPlayable())
final WorldObject wo = regionObjects.get(j);
if ((wo != null) && wo.isPlayable())
{
return false;
}

6
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/World.java
View File

@ -413,7 +413,7 @@ public class World
for (int j = 0; j < visibleObjects.size(); j++)
{
final WorldObject wo = visibleObjects.get(j);
if (wo == object)
if ((wo == null) || (wo == object))
{
continue;
}
@ -482,7 +482,7 @@ public class World
for (int j = 0; j < visibleObjects.size(); j++)
{
final WorldObject wo = visibleObjects.get(j);
if (wo == object)
if ((wo == null) || (wo == object))
{
continue;
}
@ -542,7 +542,7 @@ public class World
for (int j = 0; j < visibleObjects.size(); j++)
{
final WorldObject wo = visibleObjects.get(j);
if ((wo == object) || (wo.getInstanceWorld() != object.getInstanceWorld()))
if ((wo == null) || (wo == object) || (wo.getInstanceWorld() != object.getInstanceWorld()))
{
continue;
}

13
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/WorldRegion.java
View File

@ -55,6 +55,11 @@ public class WorldRegion
for (int i = 0; i < _visibleObjects.size(); i++)
{
final WorldObject wo = _visibleObjects.get(i);
if (wo == null)
{
continue;
}
if (wo.isAttackable())
{
final Attackable mob = (Attackable) wo;
@ -91,6 +96,11 @@ public class WorldRegion
for (int i = 0; i < _visibleObjects.size(); i++)
{
final WorldObject wo = _visibleObjects.get(i);
if (wo == null)
{
continue;
}
if (wo.isAttackable())
{
// Start HP/MP/CP regeneration task.
@ -120,7 +130,8 @@ public class WorldRegion
final List<WorldObject> regionObjects = worldRegion.getVisibleObjects();
for (int j = 0; j < regionObjects.size(); j++)
{
if (regionObjects.get(j).isPlayable())
final WorldObject wo = regionObjects.get(j);
if ((wo != null) && wo.isPlayable())
{
return false;
}

6
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/World.java
View File

@ -413,7 +413,7 @@ public class World
for (int j = 0; j < visibleObjects.size(); j++)
{
final WorldObject wo = visibleObjects.get(j);
if (wo == object)
if ((wo == null) || (wo == object))
{
continue;
}
@ -482,7 +482,7 @@ public class World
for (int j = 0; j < visibleObjects.size(); j++)
{
final WorldObject wo = visibleObjects.get(j);
if (wo == object)
if ((wo == null) || (wo == object))
{
continue;
}
@ -542,7 +542,7 @@ public class World
for (int j = 0; j < visibleObjects.size(); j++)
{
final WorldObject wo = visibleObjects.get(j);
if ((wo == object) || (wo.getInstanceWorld() != object.getInstanceWorld()))
if ((wo == null) || (wo == object) || (wo.getInstanceWorld() != object.getInstanceWorld()))
{
continue;
}

13
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/WorldRegion.java
View File

@ -55,6 +55,11 @@ public class WorldRegion
for (int i = 0; i < _visibleObjects.size(); i++)
{
final WorldObject wo = _visibleObjects.get(i);
if (wo == null)
{
continue;
}
if (wo.isAttackable())
{
final Attackable mob = (Attackable) wo;
@ -91,6 +96,11 @@ public class WorldRegion
for (int i = 0; i < _visibleObjects.size(); i++)
{
final WorldObject wo = _visibleObjects.get(i);
if (wo == null)
{
continue;
}
if (wo.isAttackable())
{
// Start HP/MP/CP regeneration task.
@ -120,7 +130,8 @@ public class WorldRegion
final List<WorldObject> regionObjects = worldRegion.getVisibleObjects();
for (int j = 0; j < regionObjects.size(); j++)
{
if (regionObjects.get(j).isPlayable())
final WorldObject wo = regionObjects.get(j);
if ((wo != null) && wo.isPlayable())
{
return false;
}

6
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/World.java
View File

@ -413,7 +413,7 @@ public class World
for (int j = 0; j < visibleObjects.size(); j++)
{
final WorldObject wo = visibleObjects.get(j);
if (wo == object)
if ((wo == null) || (wo == object))
{
continue;
}
@ -482,7 +482,7 @@ public class World
for (int j = 0; j < visibleObjects.size(); j++)
{
final WorldObject wo = visibleObjects.get(j);
if (wo == object)
if ((wo == null) || (wo == object))
{
continue;
}
@ -542,7 +542,7 @@ public class World
for (int j = 0; j < visibleObjects.size(); j++)
{
final WorldObject wo = visibleObjects.get(j);
if ((wo == object) || (wo.getInstanceWorld() != object.getInstanceWorld()))
if ((wo == null) || (wo == object) || (wo.getInstanceWorld() != object.getInstanceWorld()))
{
continue;
}

13
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/WorldRegion.java
View File

@ -55,6 +55,11 @@ public class WorldRegion
for (int i = 0; i < _visibleObjects.size(); i++)
{
final WorldObject wo = _visibleObjects.get(i);
if (wo == null)
{
continue;
}
if (wo.isAttackable())
{
final Attackable mob = (Attackable) wo;
@ -91,6 +96,11 @@ public class WorldRegion
for (int i = 0; i < _visibleObjects.size(); i++)
{
final WorldObject wo = _visibleObjects.get(i);
if (wo == null)
{
continue;
}
if (wo.isAttackable())
{
// Start HP/MP/CP regeneration task.
@ -120,7 +130,8 @@ public class WorldRegion
final List<WorldObject> regionObjects = worldRegion.getVisibleObjects();
for (int j = 0; j < regionObjects.size(); j++)
{
if (regionObjects.get(j).isPlayable())
final WorldObject wo = regionObjects.get(j);
if ((wo != null) && wo.isPlayable())
{
return false;
}

14
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/World.java
View File

@ -300,6 +300,10 @@ public class World
for (int i = 0; i < visibleObjects.size(); i++)
{
final WorldObject wo = visibleObjects.get(i);
if (wo == null)
{
continue;
}
// Add the object in WorldObjectHashSet(WorldObject) _knownObjects of the visible Creature according to conditions :
// - Creature is visible
@ -332,6 +336,10 @@ public class World
for (int i = 0; i < visibleObjects.size(); i++)
{
final WorldObject wo = visibleObjects.get(i);
if (wo == null)
{
continue;
}
// Add the object in WorldObjectHashSet(WorldObject) _knownObjects of the visible Creature according to conditions :
// - Creature is visible
@ -413,11 +421,15 @@ public class World
for (int j = 0; j < visibleObjects.size(); j++)
{
final WorldObject wo = visibleObjects.get(j);
if (wo == null)
{
continue;
}
// Remove the WorldObject from the WorldObjectHashSet(WorldObject) _knownObjects of the surrounding WorldRegion Creatures
// If object is a PlayerInstance, remove the WorldObject from the WorldObjectHashSet(PlayerInstance) _knownPlayer of the surrounding WorldRegion Creatures
// If object is targeted by one of the surrounding WorldRegion Creatures, cancel ATTACK and cast
if ((wo != null) && (wo.getKnownList() != null))
if (wo.getKnownList() != null)
{
wo.getKnownList().removeKnownObject(object);
}

24
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/WorldRegion.java
View File

@ -125,6 +125,11 @@ public class WorldRegion
for (int i = 0; i < _visibleObjects.size(); i++)
{
final WorldObject wo = _visibleObjects.get(i);
if (wo == null)
{
continue;
}
if (wo instanceof Attackable)
{
final Attackable mob = (Attackable) wo;
@ -173,6 +178,11 @@ public class WorldRegion
for (int i = 0; i < _visibleObjects.size(); i++)
{
final WorldObject wo = _visibleObjects.get(i);
if (wo == null)
{
continue;
}
if (wo instanceof Attackable)
{
// Start HP/MP/CP Regeneration task
@ -204,7 +214,8 @@ public class WorldRegion
final List<WorldObject> regionObjects = worldRegion.getVisibleObjects();
for (int j = 0; j < regionObjects.size(); j++)
{
if (regionObjects.get(j).isPlayable())
final WorldObject wo = regionObjects.get(j);
if ((wo != null) && wo.isPlayable())
{
return false;
}
@ -382,10 +393,15 @@ public class WorldRegion
LOGGER.info("Deleting all visible NPCs in Region: " + getName());
for (int i = 0; i < _visibleObjects.size(); i++)
{
final WorldObject obj = _visibleObjects.get(i);
if (obj instanceof NpcInstance)
final WorldObject wo = _visibleObjects.get(i);
if (wo == null)
{
final NpcInstance target = (NpcInstance) obj;
continue;
}
if (wo instanceof NpcInstance)
{
final NpcInstance target = (NpcInstance) wo;
target.deleteMe();
final Spawn spawn = target.getSpawn();
if (spawn != null)

14
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/World.java
View File

@ -300,6 +300,10 @@ public class World
for (int i = 0; i < visibleObjects.size(); i++)
{
final WorldObject wo = visibleObjects.get(i);
if (wo == null)
{
continue;
}
// Add the object in WorldObjectHashSet(WorldObject) _knownObjects of the visible Creature according to conditions :
// - Creature is visible
@ -332,6 +336,10 @@ public class World
for (int i = 0; i < visibleObjects.size(); i++)
{
final WorldObject wo = visibleObjects.get(i);
if (wo == null)
{
continue;
}
// Add the object in WorldObjectHashSet(WorldObject) _knownObjects of the visible Creature according to conditions :
// - Creature is visible
@ -413,11 +421,15 @@ public class World
for (int j = 0; j < visibleObjects.size(); j++)
{
final WorldObject wo = visibleObjects.get(j);
if (wo == null)
{
continue;
}
// Remove the WorldObject from the WorldObjectHashSet(WorldObject) _knownObjects of the surrounding WorldRegion Creatures
// If object is a PlayerInstance, remove the WorldObject from the WorldObjectHashSet(PlayerInstance) _knownPlayer of the surrounding WorldRegion Creatures
// If object is targeted by one of the surrounding WorldRegion Creatures, cancel ATTACK and cast
if ((wo != null) && (wo.getKnownList() != null))
if (wo.getKnownList() != null)
{
wo.getKnownList().removeKnownObject(object);
}

24
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/WorldRegion.java
View File

@ -125,6 +125,11 @@ public class WorldRegion
for (int i = 0; i < _visibleObjects.size(); i++)
{
final WorldObject wo = _visibleObjects.get(i);
if (wo == null)
{
continue;
}
if (wo instanceof Attackable)
{
final Attackable mob = (Attackable) wo;
@ -173,6 +178,11 @@ public class WorldRegion
for (int i = 0; i < _visibleObjects.size(); i++)
{
final WorldObject wo = _visibleObjects.get(i);
if (wo == null)
{
continue;
}
if (wo instanceof Attackable)
{
// Start HP/MP/CP Regeneration task
@ -204,7 +214,8 @@ public class WorldRegion
final List<WorldObject> regionObjects = worldRegion.getVisibleObjects();
for (int j = 0; j < regionObjects.size(); j++)
{
if (regionObjects.get(j).isPlayable())
final WorldObject wo = regionObjects.get(j);
if ((wo != null) && wo.isPlayable())
{
return false;
}
@ -382,10 +393,15 @@ public class WorldRegion
LOGGER.info("Deleting all visible NPCs in Region: " + getName());
for (int i = 0; i < _visibleObjects.size(); i++)
{
final WorldObject obj = _visibleObjects.get(i);
if (obj instanceof NpcInstance)
final WorldObject wo = _visibleObjects.get(i);
if (wo == null)
{
final NpcInstance target = (NpcInstance) obj;
continue;
}
if (wo instanceof NpcInstance)
{
final NpcInstance target = (NpcInstance) wo;
target.deleteMe();
final Spawn spawn = target.getSpawn();
if (spawn != null)

6
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/World.java
View File

@ -409,7 +409,7 @@ public class World
for (int j = 0; j < visibleObjects.size(); j++)
{
final WorldObject wo = visibleObjects.get(j);
if (wo == object)
if ((wo == null) || (wo == object))
{
continue;
}
@ -478,7 +478,7 @@ public class World
for (int j = 0; j < visibleObjects.size(); j++)
{
final WorldObject wo = visibleObjects.get(j);
if (wo == object)
if ((wo == null) || (wo == object))
{
continue;
}
@ -538,7 +538,7 @@ public class World
for (int j = 0; j < visibleObjects.size(); j++)
{
final WorldObject wo = visibleObjects.get(j);
if ((wo == object) || (wo.getInstanceId() != object.getInstanceId()))
if ((wo == null) || (wo == object) || (wo.getInstanceId() != object.getInstanceId()))
{
continue;
}

13
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/WorldRegion.java
View File

@ -55,6 +55,11 @@ public class WorldRegion
for (int i = 0; i < _visibleObjects.size(); i++)
{
final WorldObject wo = _visibleObjects.get(i);
if (wo == null)
{
continue;
}
if (wo.isAttackable())
{
final Attackable mob = (Attackable) wo;
@ -91,6 +96,11 @@ public class WorldRegion
for (int i = 0; i < _visibleObjects.size(); i++)
{
final WorldObject wo = _visibleObjects.get(i);
if (wo == null)
{
continue;
}
if (wo.isAttackable())
{
// Start HP/MP/CP regeneration task.
@ -120,7 +130,8 @@ public class WorldRegion
final List<WorldObject> regionObjects = worldRegion.getVisibleObjects();
for (int j = 0; j < regionObjects.size(); j++)
{
if (regionObjects.get(j).isPlayable())
final WorldObject wo = regionObjects.get(j);
if ((wo != null) && wo.isPlayable())
{
return false;
}

6
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/World.java
View File

@ -409,7 +409,7 @@ public class World
for (int j = 0; j < visibleObjects.size(); j++)
{
final WorldObject wo = visibleObjects.get(j);
if (wo == object)
if ((wo == null) || (wo == object))
{
continue;
}
@ -478,7 +478,7 @@ public class World
for (int j = 0; j < visibleObjects.size(); j++)
{
final WorldObject wo = visibleObjects.get(j);
if (wo == object)
if ((wo == null) || (wo == object))
{
continue;
}
@ -538,7 +538,7 @@ public class World
for (int j = 0; j < visibleObjects.size(); j++)
{
final WorldObject wo = visibleObjects.get(j);
if ((wo == object) || (wo.getInstanceId() != object.getInstanceId()))
if ((wo == null) || (wo == object) || (wo.getInstanceId() != object.getInstanceId()))
{
continue;
}

13
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/WorldRegion.java
View File

@ -55,6 +55,11 @@ public class WorldRegion
for (int i = 0; i < _visibleObjects.size(); i++)
{
final WorldObject wo = _visibleObjects.get(i);
if (wo == null)
{
continue;
}
if (wo.isAttackable())
{
final Attackable mob = (Attackable) wo;
@ -91,6 +96,11 @@ public class WorldRegion
for (int i = 0; i < _visibleObjects.size(); i++)
{
final WorldObject wo = _visibleObjects.get(i);
if (wo == null)
{
continue;
}
if (wo.isAttackable())
{
// Start HP/MP/CP regeneration task.
@ -120,7 +130,8 @@ public class WorldRegion
final List<WorldObject> regionObjects = worldRegion.getVisibleObjects();
for (int j = 0; j < regionObjects.size(); j++)
{
if (regionObjects.get(j).isPlayable())
final WorldObject wo = regionObjects.get(j);
if ((wo != null) && wo.isPlayable())
{
return false;
}

6
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/World.java
View File

@ -413,7 +413,7 @@ public class World
for (int j = 0; j < visibleObjects.size(); j++)
{
final WorldObject wo = visibleObjects.get(j);
if (wo == object)
if ((wo == null) || (wo == object))
{
continue;
}
@ -482,7 +482,7 @@ public class World
for (int j = 0; j < visibleObjects.size(); j++)
{
final WorldObject wo = visibleObjects.get(j);
if (wo == object)
if ((wo == null) || (wo == object))
{
continue;
}
@ -542,7 +542,7 @@ public class World
for (int j = 0; j < visibleObjects.size(); j++)
{
final WorldObject wo = visibleObjects.get(j);
if ((wo == object) || (wo.getInstanceWorld() != object.getInstanceWorld()))
if ((wo == null) || (wo == object) || (wo.getInstanceWorld() != object.getInstanceWorld()))
{
continue;
}

13
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/WorldRegion.java
View File

@ -55,6 +55,11 @@ public class WorldRegion
for (int i = 0; i < _visibleObjects.size(); i++)
{
final WorldObject wo = _visibleObjects.get(i);
if (wo == null)
{
continue;
}
if (wo.isAttackable())
{
final Attackable mob = (Attackable) wo;
@ -91,6 +96,11 @@ public class WorldRegion
for (int i = 0; i < _visibleObjects.size(); i++)
{
final WorldObject wo = _visibleObjects.get(i);
if (wo == null)
{
continue;
}
if (wo.isAttackable())
{
// Start HP/MP/CP regeneration task.
@ -120,7 +130,8 @@ public class WorldRegion
final List<WorldObject> regionObjects = worldRegion.getVisibleObjects();
for (int j = 0; j < regionObjects.size(); j++)
{
if (regionObjects.get(j).isPlayable())
final WorldObject wo = regionObjects.get(j);
if ((wo != null) && wo.isPlayable())
{
return false;
}

6
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/World.java
View File

@ -413,7 +413,7 @@ public class World
for (int j = 0; j < visibleObjects.size(); j++)
{
final WorldObject wo = visibleObjects.get(j);
if (wo == object)
if ((wo == null) || (wo == object))
{
continue;
}
@ -482,7 +482,7 @@ public class World
for (int j = 0; j < visibleObjects.size(); j++)
{
final WorldObject wo = visibleObjects.get(j);
if (wo == object)
if ((wo == null) || (wo == object))
{
continue;
}
@ -542,7 +542,7 @@ public class World
for (int j = 0; j < visibleObjects.size(); j++)
{
final WorldObject wo = visibleObjects.get(j);
if ((wo == object) || (wo.getInstanceWorld() != object.getInstanceWorld()))
if ((wo == null) || (wo == object) || (wo.getInstanceWorld() != object.getInstanceWorld()))
{
continue;
}

13
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/WorldRegion.java
View File

@ -55,6 +55,11 @@ public class WorldRegion
for (int i = 0; i < _visibleObjects.size(); i++)
{
final WorldObject wo = _visibleObjects.get(i);
if (wo == null)
{
continue;
}
if (wo.isAttackable())
{
final Attackable mob = (Attackable) wo;
@ -91,6 +96,11 @@ public class WorldRegion
for (int i = 0; i < _visibleObjects.size(); i++)
{
final WorldObject wo = _visibleObjects.get(i);
if (wo == null)
{
continue;
}
if (wo.isAttackable())
{
// Start HP/MP/CP regeneration task.
@ -120,7 +130,8 @@ public class WorldRegion
final List<WorldObject> regionObjects = worldRegion.getVisibleObjects();
for (int j = 0; j < regionObjects.size(); j++)
{
if (regionObjects.get(j).isPlayable())
final WorldObject wo = regionObjects.get(j);
if ((wo != null) && wo.isPlayable())
{
return false;
}

6
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/World.java
View File

@ -413,7 +413,7 @@ public class World
for (int j = 0; j < visibleObjects.size(); j++)
{
final WorldObject wo = visibleObjects.get(j);
if (wo == object)
if ((wo == null) || (wo == object))
{
continue;
}
@ -482,7 +482,7 @@ public class World
for (int j = 0; j < visibleObjects.size(); j++)
{
final WorldObject wo = visibleObjects.get(j);
if (wo == object)
if ((wo == null) || (wo == object))
{
continue;
}
@ -542,7 +542,7 @@ public class World
for (int j = 0; j < visibleObjects.size(); j++)
{
final WorldObject wo = visibleObjects.get(j);
if ((wo == object) || (wo.getInstanceWorld() != object.getInstanceWorld()))
if ((wo == null) || (wo == object) || (wo.getInstanceWorld() != object.getInstanceWorld()))
{
continue;
}

13
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/WorldRegion.java
View File

@ -55,6 +55,11 @@ public class WorldRegion
for (int i = 0; i < _visibleObjects.size(); i++)
{
final WorldObject wo = _visibleObjects.get(i);
if (wo == null)
{
continue;
}
if (wo.isAttackable())
{
final Attackable mob = (Attackable) wo;
@ -91,6 +96,11 @@ public class WorldRegion
for (int i = 0; i < _visibleObjects.size(); i++)
{
final WorldObject wo = _visibleObjects.get(i);
if (wo == null)
{
continue;
}
if (wo.isAttackable())
{
// Start HP/MP/CP regeneration task.
@ -120,7 +130,8 @@ public class WorldRegion
final List<WorldObject> regionObjects = worldRegion.getVisibleObjects();
for (int j = 0; j < regionObjects.size(); j++)
{
if (regionObjects.get(j).isPlayable())
final WorldObject wo = regionObjects.get(j);
if ((wo != null) && wo.isPlayable())
{
return false;
}

6
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/World.java
View File

@ -413,7 +413,7 @@ public class World
for (int j = 0; j < visibleObjects.size(); j++)
{
final WorldObject wo = visibleObjects.get(j);
if (wo == object)
if ((wo == null) || (wo == object))
{
continue;
}
@ -482,7 +482,7 @@ public class World
for (int j = 0; j < visibleObjects.size(); j++)
{
final WorldObject wo = visibleObjects.get(j);
if (wo == object)
if ((wo == null) || (wo == object))
{
continue;
}
@ -542,7 +542,7 @@ public class World
for (int j = 0; j < visibleObjects.size(); j++)
{
final WorldObject wo = visibleObjects.get(j);
if ((wo == object) || (wo.getInstanceWorld() != object.getInstanceWorld()))
if ((wo == null) || (wo == object) || (wo.getInstanceWorld() != object.getInstanceWorld()))
{
continue;
}

13
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/WorldRegion.java
View File

@ -55,6 +55,11 @@ public class WorldRegion
for (int i = 0; i < _visibleObjects.size(); i++)
{
final WorldObject wo = _visibleObjects.get(i);
if (wo == null)
{
continue;
}
if (wo.isAttackable())
{
final Attackable mob = (Attackable) wo;
@ -91,6 +96,11 @@ public class WorldRegion
for (int i = 0; i < _visibleObjects.size(); i++)
{
final WorldObject wo = _visibleObjects.get(i);
if (wo == null)
{
continue;
}
if (wo.isAttackable())
{
// Start HP/MP/CP regeneration task.
@ -120,7 +130,8 @@ public class WorldRegion
final List<WorldObject> regionObjects = worldRegion.getVisibleObjects();
for (int j = 0; j < regionObjects.size(); j++)
{
if (regionObjects.get(j).isPlayable())
final WorldObject wo = regionObjects.get(j);
if ((wo != null) && wo.isPlayable())
{
return false;
}

6
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/World.java
View File

@ -413,7 +413,7 @@ public class World
for (int j = 0; j < visibleObjects.size(); j++)
{
final WorldObject wo = visibleObjects.get(j);
if (wo == object)
if ((wo == null) || (wo == object))
{
continue;
}
@ -482,7 +482,7 @@ public class World
for (int j = 0; j < visibleObjects.size(); j++)
{
final WorldObject wo = visibleObjects.get(j);
if (wo == object)
if ((wo == null) || (wo == object))
{
continue;
}
@ -542,7 +542,7 @@ public class World
for (int j = 0; j < visibleObjects.size(); j++)
{
final WorldObject wo = visibleObjects.get(j);
if ((wo == object) || (wo.getInstanceWorld() != object.getInstanceWorld()))
if ((wo == null) || (wo == object) || (wo.getInstanceWorld() != object.getInstanceWorld()))
{
continue;
}

13
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/WorldRegion.java
View File

@ -55,6 +55,11 @@ public class WorldRegion
for (int i = 0; i < _visibleObjects.size(); i++)
{
final WorldObject wo = _visibleObjects.get(i);
if (wo == null)
{
continue;
}
if (wo.isAttackable())
{
final Attackable mob = (Attackable) wo;
@ -91,6 +96,11 @@ public class WorldRegion
for (int i = 0; i < _visibleObjects.size(); i++)
{
final WorldObject wo = _visibleObjects.get(i);
if (wo == null)
{
continue;
}
if (wo.isAttackable())
{
// Start HP/MP/CP regeneration task.
@ -120,7 +130,8 @@ public class WorldRegion
final List<WorldObject> regionObjects = worldRegion.getVisibleObjects();
for (int j = 0; j < regionObjects.size(); j++)
{
if (regionObjects.get(j).isPlayable())
final WorldObject wo = regionObjects.get(j);
if ((wo != null) && wo.isPlayable())
{
return false;
}

6
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/World.java
View File

@ -413,7 +413,7 @@ public class World
for (int j = 0; j < visibleObjects.size(); j++)
{
final WorldObject wo = visibleObjects.get(j);
if (wo == object)
if ((wo == null) || (wo == object))
{
continue;
}
@ -482,7 +482,7 @@ public class World
for (int j = 0; j < visibleObjects.size(); j++)
{
final WorldObject wo = visibleObjects.get(j);
if (wo == object)
if ((wo == null) || (wo == object))
{
continue;
}
@ -542,7 +542,7 @@ public class World
for (int j = 0; j < visibleObjects.size(); j++)
{
final WorldObject wo = visibleObjects.get(j);
if ((wo == object) || (wo.getInstanceWorld() != object.getInstanceWorld()))
if ((wo == null) || (wo == object) || (wo.getInstanceWorld() != object.getInstanceWorld()))
{
continue;
}

13
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/WorldRegion.java
View File

@ -55,6 +55,11 @@ public class WorldRegion
for (int i = 0; i < _visibleObjects.size(); i++)
{
final WorldObject wo = _visibleObjects.get(i);
if (wo == null)
{
continue;
}
if (wo.isAttackable())
{
final Attackable mob = (Attackable) wo;
@ -91,6 +96,11 @@ public class WorldRegion
for (int i = 0; i < _visibleObjects.size(); i++)
{
final WorldObject wo = _visibleObjects.get(i);
if (wo == null)
{
continue;
}
if (wo.isAttackable())
{
// Start HP/MP/CP regeneration task.
@ -120,7 +130,8 @@ public class WorldRegion
final List<WorldObject> regionObjects = worldRegion.getVisibleObjects();
for (int j = 0; j < regionObjects.size(); j++)
{
if (regionObjects.get(j).isPlayable())
final WorldObject wo = regionObjects.get(j);
if ((wo != null) && wo.isPlayable())
{
return false;
}

6
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/World.java
View File

@ -413,7 +413,7 @@ public class World
for (int j = 0; j < visibleObjects.size(); j++)
{
final WorldObject wo = visibleObjects.get(j);
if (wo == object)
if ((wo == null) || (wo == object))
{
continue;
}
@ -482,7 +482,7 @@ public class World
for (int j = 0; j < visibleObjects.size(); j++)
{
final WorldObject wo = visibleObjects.get(j);
if (wo == object)
if ((wo == null) || (wo == object))
{
continue;
}
@ -542,7 +542,7 @@ public class World
for (int j = 0; j < visibleObjects.size(); j++)
{
final WorldObject wo = visibleObjects.get(j);
if ((wo == object) || (wo.getInstanceWorld() != object.getInstanceWorld()))
if ((wo == null) || (wo == object) || (wo.getInstanceWorld() != object.getInstanceWorld()))
{
continue;
}

13
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/WorldRegion.java
View File

@ -55,6 +55,11 @@ public class WorldRegion
for (int i = 0; i < _visibleObjects.size(); i++)
{
final WorldObject wo = _visibleObjects.get(i);
if (wo == null)
{
continue;
}
if (wo.isAttackable())
{
final Attackable mob = (Attackable) wo;
@ -91,6 +96,11 @@ public class WorldRegion
for (int i = 0; i < _visibleObjects.size(); i++)
{
final WorldObject wo = _visibleObjects.get(i);
if (wo == null)
{
continue;
}
if (wo.isAttackable())
{
// Start HP/MP/CP regeneration task.
@ -120,7 +130,8 @@ public class WorldRegion
final List<WorldObject> regionObjects = worldRegion.getVisibleObjects();
for (int j = 0; j < regionObjects.size(); j++)
{
if (regionObjects.get(j).isPlayable())
final WorldObject wo = regionObjects.get(j);
if ((wo != null) && wo.isPlayable())
{
return false;
}