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

NPE fix for captives.

Browse Source
This commit is contained in:
MobiusDev 2018-04-03 17:26:35 +00:00
parent 435beb5dfe
commit ea8ee773c4
3 changed files with 33 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java vendored
View File

@ -16,6 +16,8 @@
*/
package instances.AshenShadowRevolutionaries;
import java.util.List;
import com.l2jmobius.commons.util.CommonUtil;
import com.l2jmobius.gameserver.enums.ChatType;
import com.l2jmobius.gameserver.instancemanager.ZoneManager;
@ -258,12 +260,16 @@ public class AshenShadowRevolutionaries extends AbstractInstance
}
else
{
for (L2Npc captive : world.getParameters().getList("CAPTIVES", L2Npc.class))
final List<L2Npc> captives = world.getParameters().getList("CAPTIVES", L2Npc.class);
if (captives != null)
{
captive.setTargetable(true);
captive.getEffectList().stopAbnormalVisualEffect(AbnormalVisualEffect.FLESH_STONE);
captive.getEffectList().startAbnormalVisualEffect(AbnormalVisualEffect.MAGIC_SQUARE);
captive.broadcastInfo();
for (L2Npc captive : captives)
{
captive.setTargetable(true);
captive.getEffectList().stopAbnormalVisualEffect(AbnormalVisualEffect.FLESH_STONE);
captive.getEffectList().startAbnormalVisualEffect(AbnormalVisualEffect.MAGIC_SQUARE);
captive.broadcastInfo();
}
}
world.spawnGroup("wave_3");
world.finishInstance();

16
L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java vendored
View File

@ -16,6 +16,8 @@
*/
package instances.AshenShadowRevolutionaries;
import java.util.List;
import com.l2jmobius.commons.util.CommonUtil;
import com.l2jmobius.gameserver.enums.ChatType;
import com.l2jmobius.gameserver.instancemanager.ZoneManager;
@ -258,12 +260,16 @@ public class AshenShadowRevolutionaries extends AbstractInstance
}
else
{
for (L2Npc captive : world.getParameters().getList("CAPTIVES", L2Npc.class))
final List<L2Npc> captives = world.getParameters().getList("CAPTIVES", L2Npc.class);
if (captives != null)
{
captive.setTargetable(true);
captive.getEffectList().stopAbnormalVisualEffect(AbnormalVisualEffect.FLESH_STONE);
captive.getEffectList().startAbnormalVisualEffect(AbnormalVisualEffect.MAGIC_SQUARE);
captive.broadcastInfo();
for (L2Npc captive : captives)
{
captive.setTargetable(true);
captive.getEffectList().stopAbnormalVisualEffect(AbnormalVisualEffect.FLESH_STONE);
captive.getEffectList().startAbnormalVisualEffect(AbnormalVisualEffect.MAGIC_SQUARE);
captive.broadcastInfo();
}
}
world.spawnGroup("wave_3");
world.finishInstance();

16
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java vendored
View File

@ -16,6 +16,8 @@
*/
package instances.AshenShadowRevolutionaries;
import java.util.List;
import com.l2jmobius.commons.util.CommonUtil;
import com.l2jmobius.gameserver.enums.ChatType;
import com.l2jmobius.gameserver.instancemanager.ZoneManager;
@ -258,12 +260,16 @@ public class AshenShadowRevolutionaries extends AbstractInstance
}
else
{
for (L2Npc captive : world.getParameters().getList("CAPTIVES", L2Npc.class))
final List<L2Npc> captives = world.getParameters().getList("CAPTIVES", L2Npc.class);
if (captives != null)
{
captive.setTargetable(true);
captive.getEffectList().stopAbnormalVisualEffect(AbnormalVisualEffect.FLESH_STONE);
captive.getEffectList().startAbnormalVisualEffect(AbnormalVisualEffect.MAGIC_SQUARE);
captive.broadcastInfo();
for (L2Npc captive : captives)
{
captive.setTargetable(true);
captive.getEffectList().stopAbnormalVisualEffect(AbnormalVisualEffect.FLESH_STONE);
captive.getEffectList().startAbnormalVisualEffect(AbnormalVisualEffect.MAGIC_SQUARE);
captive.broadcastInfo();
}
}
world.spawnGroup("wave_3");
world.finishInstance();