From 2037ee3375604068e0e36ed0a28a9ca6ef888371 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Mon, 9 Mar 2020 09:45:02 +0000 Subject: [PATCH] Fixed Dimensional Wrap earthquake NPE. --- .../data/scripts/instances/DimensionalWrap/DimensionalWrap.java | 2 +- .../data/scripts/instances/DimensionalWrap/DimensionalWrap.java | 2 +- .../data/scripts/instances/DimensionalWrap/DimensionalWrap.java | 2 +- .../data/scripts/instances/DimensionalWrap/DimensionalWrap.java | 2 +- .../data/scripts/instances/DimensionalWrap/DimensionalWrap.java | 2 +- .../data/scripts/instances/DimensionalWrap/DimensionalWrap.java | 2 +- .../data/scripts/instances/DimensionalWrap/DimensionalWrap.java | 2 +- .../data/scripts/instances/DimensionalWrap/DimensionalWrap.java | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java index c8aa538d8f..d857b478b0 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java @@ -617,7 +617,7 @@ public class DimensionalWrap extends AbstractInstance if (world.getAliveNpcs(MONSTERS).isEmpty()) { world.broadcastPacket(new ExShowScreenMessage(NpcStringId.THE_SURROUNDING_ENERGY_HAS_DISSIPATED, ExShowScreenMessage.TOP_CENTER, 5000, true)); - world.broadcastPacket(new Earthquake(npc, 50, 5)); + world.broadcastPacket(new Earthquake(player, 50, 5)); world.openCloseDoor(world.getTemplateParameters().getInt(world.getParameters().getInt("worldState", 0) + "_st_door"), true); clean(world.getFirstPlayer()); if (world.getParameters().getInt("worldState", 0) < 35) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java index c8aa538d8f..d857b478b0 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java @@ -617,7 +617,7 @@ public class DimensionalWrap extends AbstractInstance if (world.getAliveNpcs(MONSTERS).isEmpty()) { world.broadcastPacket(new ExShowScreenMessage(NpcStringId.THE_SURROUNDING_ENERGY_HAS_DISSIPATED, ExShowScreenMessage.TOP_CENTER, 5000, true)); - world.broadcastPacket(new Earthquake(npc, 50, 5)); + world.broadcastPacket(new Earthquake(player, 50, 5)); world.openCloseDoor(world.getTemplateParameters().getInt(world.getParameters().getInt("worldState", 0) + "_st_door"), true); clean(world.getFirstPlayer()); if (world.getParameters().getInt("worldState", 0) < 35) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java index c8aa538d8f..d857b478b0 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java @@ -617,7 +617,7 @@ public class DimensionalWrap extends AbstractInstance if (world.getAliveNpcs(MONSTERS).isEmpty()) { world.broadcastPacket(new ExShowScreenMessage(NpcStringId.THE_SURROUNDING_ENERGY_HAS_DISSIPATED, ExShowScreenMessage.TOP_CENTER, 5000, true)); - world.broadcastPacket(new Earthquake(npc, 50, 5)); + world.broadcastPacket(new Earthquake(player, 50, 5)); world.openCloseDoor(world.getTemplateParameters().getInt(world.getParameters().getInt("worldState", 0) + "_st_door"), true); clean(world.getFirstPlayer()); if (world.getParameters().getInt("worldState", 0) < 35) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java index c8aa538d8f..d857b478b0 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java @@ -617,7 +617,7 @@ public class DimensionalWrap extends AbstractInstance if (world.getAliveNpcs(MONSTERS).isEmpty()) { world.broadcastPacket(new ExShowScreenMessage(NpcStringId.THE_SURROUNDING_ENERGY_HAS_DISSIPATED, ExShowScreenMessage.TOP_CENTER, 5000, true)); - world.broadcastPacket(new Earthquake(npc, 50, 5)); + world.broadcastPacket(new Earthquake(player, 50, 5)); world.openCloseDoor(world.getTemplateParameters().getInt(world.getParameters().getInt("worldState", 0) + "_st_door"), true); clean(world.getFirstPlayer()); if (world.getParameters().getInt("worldState", 0) < 35) diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java index 951d1c20d3..8a3aae7f9f 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java @@ -617,7 +617,7 @@ public class DimensionalWrap extends AbstractInstance if (world.getAliveNpcs(MONSTERS).isEmpty()) { world.broadcastPacket(new ExShowScreenMessage(NpcStringId.THE_SURROUNDING_ENERGY_HAS_DISSIPATED, ExShowScreenMessage.TOP_CENTER, 5000, true)); - world.broadcastPacket(new Earthquake(npc, 50, 5)); + world.broadcastPacket(new Earthquake(player, 50, 5)); world.openCloseDoor(world.getTemplateParameters().getInt(world.getParameters().getInt("worldState", 0) + "_st_door"), true); clean(world.getFirstPlayer()); if (world.getParameters().getInt("worldState", 0) < 35) diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java index 951d1c20d3..8a3aae7f9f 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java @@ -617,7 +617,7 @@ public class DimensionalWrap extends AbstractInstance if (world.getAliveNpcs(MONSTERS).isEmpty()) { world.broadcastPacket(new ExShowScreenMessage(NpcStringId.THE_SURROUNDING_ENERGY_HAS_DISSIPATED, ExShowScreenMessage.TOP_CENTER, 5000, true)); - world.broadcastPacket(new Earthquake(npc, 50, 5)); + world.broadcastPacket(new Earthquake(player, 50, 5)); world.openCloseDoor(world.getTemplateParameters().getInt(world.getParameters().getInt("worldState", 0) + "_st_door"), true); clean(world.getFirstPlayer()); if (world.getParameters().getInt("worldState", 0) < 35) diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java index c8aa538d8f..d857b478b0 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java @@ -617,7 +617,7 @@ public class DimensionalWrap extends AbstractInstance if (world.getAliveNpcs(MONSTERS).isEmpty()) { world.broadcastPacket(new ExShowScreenMessage(NpcStringId.THE_SURROUNDING_ENERGY_HAS_DISSIPATED, ExShowScreenMessage.TOP_CENTER, 5000, true)); - world.broadcastPacket(new Earthquake(npc, 50, 5)); + world.broadcastPacket(new Earthquake(player, 50, 5)); world.openCloseDoor(world.getTemplateParameters().getInt(world.getParameters().getInt("worldState", 0) + "_st_door"), true); clean(world.getFirstPlayer()); if (world.getParameters().getInt("worldState", 0) < 35) diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java index dbbd6dc47e..13a6017ce9 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java @@ -617,7 +617,7 @@ public class DimensionalWrap extends AbstractInstance if (world.getAliveNpcs(MONSTERS).isEmpty()) { world.broadcastPacket(new ExShowScreenMessage(NpcStringId.THE_SURROUNDING_ENERGY_HAS_DISSIPATED, ExShowScreenMessage.TOP_CENTER, 5000, true)); - world.broadcastPacket(new Earthquake(npc, 50, 5)); + world.broadcastPacket(new Earthquake(player, 50, 5)); world.openCloseDoor(world.getTemplateParameters().getInt(world.getParameters().getInt("worldState", 0) + "_st_door"), true); clean(world.getFirstPlayer()); if (world.getParameters().getInt("worldState", 0) < 35)