From e142e4633d4e6fc1ba0dd5226d65e708cb3a52cd Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Fri, 8 Jun 2018 15:22:37 +0000
Subject: [PATCH] Avoid possible NPEs with playMovie for world.

---
 .../gameserver/model/events/AbstractScript.java       | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/events/AbstractScript.java
index 4380932775..3312d8b2e6 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/events/AbstractScript.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/events/AbstractScript.java
@@ -2926,9 +2926,16 @@ public abstract class AbstractScript extends ManagedScript
 	 */
 	public void playMovie(InstanceWorld world, Movie movie)
 	{
-		for (int objId : world.getAllowed())
+		if (world != null)
 		{
-			playMovie(L2World.getInstance().getPlayer(objId), movie);
+			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);
+				}
+			}
 		}
 	}
 }