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

Avoid possible NPEs with playMovie for world.

Browse Source
This commit is contained in:
MobiusDev
2018-06-08 15:22:37 +00:00
parent 0cb542afd9
commit e142e4633d
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/events/AbstractScript.java
View File

@@ -2925,10 +2925,17 @@ public abstract class AbstractScript extends ManagedScript
* @param movie the movie * @param movie the movie
*/ */
public void playMovie(InstanceWorld world, Movie movie) public void playMovie(InstanceWorld world, Movie movie)
{
if (world != null)
{ {
for (int objId : world.getAllowed()) for (int objId : world.getAllowed())
{
final L2PcInstance player = L2World.getInstance().getPlayer(objId);
if ((player != null) && (player.getInstanceId() == world.getInstanceId()))
{ {
playMovie(L2World.getInstance().getPlayer(objId), movie); playMovie(L2World.getInstance().getPlayer(objId), movie);
} }
} }
} }
}
}