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

Fixed Dimensional Wrap salamandra spawn NPE.

Browse Source
This commit is contained in:
MobiusDevelopment 2020-03-10 23:39:45 +00:00
parent efd832b2e2
commit 04cf6bf8a9
8 changed files with 32 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java vendored
View File

@ -303,7 +303,6 @@ public class DimensionalWrap extends AbstractInstance
htmltext = "33975-05.html"; htmltext = "33975-05.html";
break; break;
} }
for (Npc n : world.getAliveNpcs()) for (Npc n : world.getAliveNpcs())
{ {
if (n.getId() != EINSTER) if (n.getId() != EINSTER)
@ -342,7 +341,6 @@ public class DimensionalWrap extends AbstractInstance
htmltext = "33975-05.html"; htmltext = "33975-05.html";
break; break;
} }
for (Npc n : world.getAliveNpcs()) for (Npc n : world.getAliveNpcs())
{ {
if (n.getId() != EINSTER) if (n.getId() != EINSTER)
@ -381,7 +379,6 @@ public class DimensionalWrap extends AbstractInstance
htmltext = "33975-05.html"; htmltext = "33975-05.html";
break; break;
} }
for (Npc n : world.getAliveNpcs()) for (Npc n : world.getAliveNpcs())
{ {
if (n.getId() != EINSTER) if (n.getId() != EINSTER)
@ -420,7 +417,6 @@ public class DimensionalWrap extends AbstractInstance
htmltext = "33975-05.html"; htmltext = "33975-05.html";
break; break;
} }
for (Npc n : world.getAliveNpcs()) for (Npc n : world.getAliveNpcs())
{ {
if (n.getId() != EINSTER) if (n.getId() != EINSTER)
@ -459,7 +455,6 @@ public class DimensionalWrap extends AbstractInstance
htmltext = "33975-05.html"; htmltext = "33975-05.html";
break; break;
} }
for (Npc n : world.getAliveNpcs()) for (Npc n : world.getAliveNpcs())
{ {
if (n.getId() != EINSTER) if (n.getId() != EINSTER)
@ -706,13 +701,13 @@ public class DimensionalWrap extends AbstractInstance
{ {
case SALAMANDRA_GENERATOR: case SALAMANDRA_GENERATOR:
{ {
startQuestTimer("SALAMANDRA_SPAWN", 25000, null, world.getFirstPlayer(), true); startQuestTimer("SALAMANDRA_SPAWN", 25000, npc, world.getFirstPlayer(), true);
startQuestTimer("CHANGE_LOCATION", 60000 - (world.getParameters().getInt("worldState", 0) * 1300), null, world.getFirstPlayer()); startQuestTimer("CHANGE_LOCATION", 60000 - (world.getParameters().getInt("worldState", 0) * 1300), null, world.getFirstPlayer());
break; break;
} }
case SALAMANDRA_GENERATOR_DUMMY: case SALAMANDRA_GENERATOR_DUMMY:
{ {
startQuestTimer("SALAMANDRA_SPAWN_DUMMY", 20000, null, world.getFirstPlayer(), true); startQuestTimer("SALAMANDRA_SPAWN_DUMMY", 20000, npc, world.getFirstPlayer(), true);
break; break;
} }
case DEMINSIONAL_INVISIBLE_FRAGMENT: case DEMINSIONAL_INVISIBLE_FRAGMENT:
@ -758,8 +753,8 @@ public class DimensionalWrap extends AbstractInstance
protected void clean(PlayerInstance player) protected void clean(PlayerInstance player)
{ {
cancelQuestTimer("SWITCH_STAGE", null, player); cancelQuestTimer("SWITCH_STAGE", null, player);
cancelQuestTimer("SALAMANDRA_SPAWN", null, player); // cancelQuestTimer("SALAMANDRA_SPAWN", null, player);
cancelQuestTimer("SALAMANDRA_SPAWN_DUMMY", null, player); // cancelQuestTimer("SALAMANDRA_SPAWN_DUMMY", null, player);
cancelQuestTimer("CHANGE_LOCATION", null, player); cancelQuestTimer("CHANGE_LOCATION", null, player);
cancelQuestTimer("DEBUFF_TASK", null, player); cancelQuestTimer("DEBUFF_TASK", null, player);
} }

13
L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java vendored
View File

@ -303,7 +303,6 @@ public class DimensionalWrap extends AbstractInstance
htmltext = "33975-05.html"; htmltext = "33975-05.html";
break; break;
} }
for (Npc n : world.getAliveNpcs()) for (Npc n : world.getAliveNpcs())
{ {
if (n.getId() != EINSTER) if (n.getId() != EINSTER)
@ -342,7 +341,6 @@ public class DimensionalWrap extends AbstractInstance
htmltext = "33975-05.html"; htmltext = "33975-05.html";
break; break;
} }
for (Npc n : world.getAliveNpcs()) for (Npc n : world.getAliveNpcs())
{ {
if (n.getId() != EINSTER) if (n.getId() != EINSTER)
@ -381,7 +379,6 @@ public class DimensionalWrap extends AbstractInstance
htmltext = "33975-05.html"; htmltext = "33975-05.html";
break; break;
} }
for (Npc n : world.getAliveNpcs()) for (Npc n : world.getAliveNpcs())
{ {
if (n.getId() != EINSTER) if (n.getId() != EINSTER)
@ -420,7 +417,6 @@ public class DimensionalWrap extends AbstractInstance
htmltext = "33975-05.html"; htmltext = "33975-05.html";
break; break;
} }
for (Npc n : world.getAliveNpcs()) for (Npc n : world.getAliveNpcs())
{ {
if (n.getId() != EINSTER) if (n.getId() != EINSTER)
@ -459,7 +455,6 @@ public class DimensionalWrap extends AbstractInstance
htmltext = "33975-05.html"; htmltext = "33975-05.html";
break; break;
} }
for (Npc n : world.getAliveNpcs()) for (Npc n : world.getAliveNpcs())
{ {
if (n.getId() != EINSTER) if (n.getId() != EINSTER)
@ -706,13 +701,13 @@ public class DimensionalWrap extends AbstractInstance
{ {
case SALAMANDRA_GENERATOR: case SALAMANDRA_GENERATOR:
{ {
startQuestTimer("SALAMANDRA_SPAWN", 25000, null, world.getFirstPlayer(), true); startQuestTimer("SALAMANDRA_SPAWN", 25000, npc, world.getFirstPlayer(), true);
startQuestTimer("CHANGE_LOCATION", 60000 - (world.getParameters().getInt("worldState", 0) * 1300), null, world.getFirstPlayer()); startQuestTimer("CHANGE_LOCATION", 60000 - (world.getParameters().getInt("worldState", 0) * 1300), null, world.getFirstPlayer());
break; break;
} }
case SALAMANDRA_GENERATOR_DUMMY: case SALAMANDRA_GENERATOR_DUMMY:
{ {
startQuestTimer("SALAMANDRA_SPAWN_DUMMY", 20000, null, world.getFirstPlayer(), true); startQuestTimer("SALAMANDRA_SPAWN_DUMMY", 20000, npc, world.getFirstPlayer(), true);
break; break;
} }
case DEMINSIONAL_INVISIBLE_FRAGMENT: case DEMINSIONAL_INVISIBLE_FRAGMENT:
@ -758,8 +753,8 @@ public class DimensionalWrap extends AbstractInstance
protected void clean(PlayerInstance player) protected void clean(PlayerInstance player)
{ {
cancelQuestTimer("SWITCH_STAGE", null, player); cancelQuestTimer("SWITCH_STAGE", null, player);
cancelQuestTimer("SALAMANDRA_SPAWN", null, player); // cancelQuestTimer("SALAMANDRA_SPAWN", null, player);
cancelQuestTimer("SALAMANDRA_SPAWN_DUMMY", null, player); // cancelQuestTimer("SALAMANDRA_SPAWN_DUMMY", null, player);
cancelQuestTimer("CHANGE_LOCATION", null, player); cancelQuestTimer("CHANGE_LOCATION", null, player);
cancelQuestTimer("DEBUFF_TASK", null, player); cancelQuestTimer("DEBUFF_TASK", null, player);
} }

13
L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java vendored
View File

@ -303,7 +303,6 @@ public class DimensionalWrap extends AbstractInstance
htmltext = "33975-05.html"; htmltext = "33975-05.html";
break; break;
} }
for (Npc n : world.getAliveNpcs()) for (Npc n : world.getAliveNpcs())
{ {
if (n.getId() != EINSTER) if (n.getId() != EINSTER)
@ -342,7 +341,6 @@ public class DimensionalWrap extends AbstractInstance
htmltext = "33975-05.html"; htmltext = "33975-05.html";
break; break;
} }
for (Npc n : world.getAliveNpcs()) for (Npc n : world.getAliveNpcs())
{ {
if (n.getId() != EINSTER) if (n.getId() != EINSTER)
@ -381,7 +379,6 @@ public class DimensionalWrap extends AbstractInstance
htmltext = "33975-05.html"; htmltext = "33975-05.html";
break; break;
} }
for (Npc n : world.getAliveNpcs()) for (Npc n : world.getAliveNpcs())
{ {
if (n.getId() != EINSTER) if (n.getId() != EINSTER)
@ -420,7 +417,6 @@ public class DimensionalWrap extends AbstractInstance
htmltext = "33975-05.html"; htmltext = "33975-05.html";
break; break;
} }
for (Npc n : world.getAliveNpcs()) for (Npc n : world.getAliveNpcs())
{ {
if (n.getId() != EINSTER) if (n.getId() != EINSTER)
@ -459,7 +455,6 @@ public class DimensionalWrap extends AbstractInstance
htmltext = "33975-05.html"; htmltext = "33975-05.html";
break; break;
} }
for (Npc n : world.getAliveNpcs()) for (Npc n : world.getAliveNpcs())
{ {
if (n.getId() != EINSTER) if (n.getId() != EINSTER)
@ -706,13 +701,13 @@ public class DimensionalWrap extends AbstractInstance
{ {
case SALAMANDRA_GENERATOR: case SALAMANDRA_GENERATOR:
{ {
startQuestTimer("SALAMANDRA_SPAWN", 25000, null, world.getFirstPlayer(), true); startQuestTimer("SALAMANDRA_SPAWN", 25000, npc, world.getFirstPlayer(), true);
startQuestTimer("CHANGE_LOCATION", 60000 - (world.getParameters().getInt("worldState", 0) * 1300), null, world.getFirstPlayer()); startQuestTimer("CHANGE_LOCATION", 60000 - (world.getParameters().getInt("worldState", 0) * 1300), null, world.getFirstPlayer());
break; break;
} }
case SALAMANDRA_GENERATOR_DUMMY: case SALAMANDRA_GENERATOR_DUMMY:
{ {
startQuestTimer("SALAMANDRA_SPAWN_DUMMY", 20000, null, world.getFirstPlayer(), true); startQuestTimer("SALAMANDRA_SPAWN_DUMMY", 20000, npc, world.getFirstPlayer(), true);
break; break;
} }
case DEMINSIONAL_INVISIBLE_FRAGMENT: case DEMINSIONAL_INVISIBLE_FRAGMENT:
@ -758,8 +753,8 @@ public class DimensionalWrap extends AbstractInstance
protected void clean(PlayerInstance player) protected void clean(PlayerInstance player)
{ {
cancelQuestTimer("SWITCH_STAGE", null, player); cancelQuestTimer("SWITCH_STAGE", null, player);
cancelQuestTimer("SALAMANDRA_SPAWN", null, player); // cancelQuestTimer("SALAMANDRA_SPAWN", null, player);
cancelQuestTimer("SALAMANDRA_SPAWN_DUMMY", null, player); // cancelQuestTimer("SALAMANDRA_SPAWN_DUMMY", null, player);
cancelQuestTimer("CHANGE_LOCATION", null, player); cancelQuestTimer("CHANGE_LOCATION", null, player);
cancelQuestTimer("DEBUFF_TASK", null, player); cancelQuestTimer("DEBUFF_TASK", null, player);
} }

13
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java vendored
View File

@ -303,7 +303,6 @@ public class DimensionalWrap extends AbstractInstance
htmltext = "33975-05.html"; htmltext = "33975-05.html";
break; break;
} }
for (Npc n : world.getAliveNpcs()) for (Npc n : world.getAliveNpcs())
{ {
if (n.getId() != EINSTER) if (n.getId() != EINSTER)
@ -342,7 +341,6 @@ public class DimensionalWrap extends AbstractInstance
htmltext = "33975-05.html"; htmltext = "33975-05.html";
break; break;
} }
for (Npc n : world.getAliveNpcs()) for (Npc n : world.getAliveNpcs())
{ {
if (n.getId() != EINSTER) if (n.getId() != EINSTER)
@ -381,7 +379,6 @@ public class DimensionalWrap extends AbstractInstance
htmltext = "33975-05.html"; htmltext = "33975-05.html";
break; break;
} }
for (Npc n : world.getAliveNpcs()) for (Npc n : world.getAliveNpcs())
{ {
if (n.getId() != EINSTER) if (n.getId() != EINSTER)
@ -420,7 +417,6 @@ public class DimensionalWrap extends AbstractInstance
htmltext = "33975-05.html"; htmltext = "33975-05.html";
break; break;
} }
for (Npc n : world.getAliveNpcs()) for (Npc n : world.getAliveNpcs())
{ {
if (n.getId() != EINSTER) if (n.getId() != EINSTER)
@ -459,7 +455,6 @@ public class DimensionalWrap extends AbstractInstance
htmltext = "33975-05.html"; htmltext = "33975-05.html";
break; break;
} }
for (Npc n : world.getAliveNpcs()) for (Npc n : world.getAliveNpcs())
{ {
if (n.getId() != EINSTER) if (n.getId() != EINSTER)
@ -706,13 +701,13 @@ public class DimensionalWrap extends AbstractInstance
{ {
case SALAMANDRA_GENERATOR: case SALAMANDRA_GENERATOR:
{ {
startQuestTimer("SALAMANDRA_SPAWN", 25000, null, world.getFirstPlayer(), true); startQuestTimer("SALAMANDRA_SPAWN", 25000, npc, world.getFirstPlayer(), true);
startQuestTimer("CHANGE_LOCATION", 60000 - (world.getParameters().getInt("worldState", 0) * 1300), null, world.getFirstPlayer()); startQuestTimer("CHANGE_LOCATION", 60000 - (world.getParameters().getInt("worldState", 0) * 1300), null, world.getFirstPlayer());
break; break;
} }
case SALAMANDRA_GENERATOR_DUMMY: case SALAMANDRA_GENERATOR_DUMMY:
{ {
startQuestTimer("SALAMANDRA_SPAWN_DUMMY", 20000, null, world.getFirstPlayer(), true); startQuestTimer("SALAMANDRA_SPAWN_DUMMY", 20000, npc, world.getFirstPlayer(), true);
break; break;
} }
case DEMINSIONAL_INVISIBLE_FRAGMENT: case DEMINSIONAL_INVISIBLE_FRAGMENT:
@ -758,8 +753,8 @@ public class DimensionalWrap extends AbstractInstance
protected void clean(PlayerInstance player) protected void clean(PlayerInstance player)
{ {
cancelQuestTimer("SWITCH_STAGE", null, player); cancelQuestTimer("SWITCH_STAGE", null, player);
cancelQuestTimer("SALAMANDRA_SPAWN", null, player); // cancelQuestTimer("SALAMANDRA_SPAWN", null, player);
cancelQuestTimer("SALAMANDRA_SPAWN_DUMMY", null, player); // cancelQuestTimer("SALAMANDRA_SPAWN_DUMMY", null, player);
cancelQuestTimer("CHANGE_LOCATION", null, player); cancelQuestTimer("CHANGE_LOCATION", null, player);
cancelQuestTimer("DEBUFF_TASK", null, player); cancelQuestTimer("DEBUFF_TASK", null, player);
} }

13
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java vendored
View File

@ -303,7 +303,6 @@ public class DimensionalWrap extends AbstractInstance
htmltext = "33975-05.html"; htmltext = "33975-05.html";
break; break;
} }
for (Npc n : world.getAliveNpcs()) for (Npc n : world.getAliveNpcs())
{ {
if (n.getId() != EINSTER) if (n.getId() != EINSTER)
@ -342,7 +341,6 @@ public class DimensionalWrap extends AbstractInstance
htmltext = "33975-05.html"; htmltext = "33975-05.html";
break; break;
} }
for (Npc n : world.getAliveNpcs()) for (Npc n : world.getAliveNpcs())
{ {
if (n.getId() != EINSTER) if (n.getId() != EINSTER)
@ -381,7 +379,6 @@ public class DimensionalWrap extends AbstractInstance
htmltext = "33975-05.html"; htmltext = "33975-05.html";
break; break;
} }
for (Npc n : world.getAliveNpcs()) for (Npc n : world.getAliveNpcs())
{ {
if (n.getId() != EINSTER) if (n.getId() != EINSTER)
@ -420,7 +417,6 @@ public class DimensionalWrap extends AbstractInstance
htmltext = "33975-05.html"; htmltext = "33975-05.html";
break; break;
} }
for (Npc n : world.getAliveNpcs()) for (Npc n : world.getAliveNpcs())
{ {
if (n.getId() != EINSTER) if (n.getId() != EINSTER)
@ -459,7 +455,6 @@ public class DimensionalWrap extends AbstractInstance
htmltext = "33975-05.html"; htmltext = "33975-05.html";
break; break;
} }
for (Npc n : world.getAliveNpcs()) for (Npc n : world.getAliveNpcs())
{ {
if (n.getId() != EINSTER) if (n.getId() != EINSTER)
@ -706,13 +701,13 @@ public class DimensionalWrap extends AbstractInstance
{ {
case SALAMANDRA_GENERATOR: case SALAMANDRA_GENERATOR:
{ {
startQuestTimer("SALAMANDRA_SPAWN", 25000, null, world.getFirstPlayer(), true); startQuestTimer("SALAMANDRA_SPAWN", 25000, npc, world.getFirstPlayer(), true);
startQuestTimer("CHANGE_LOCATION", 60000 - (world.getParameters().getInt("worldState", 0) * 1300), null, world.getFirstPlayer()); startQuestTimer("CHANGE_LOCATION", 60000 - (world.getParameters().getInt("worldState", 0) * 1300), null, world.getFirstPlayer());
break; break;
} }
case SALAMANDRA_GENERATOR_DUMMY: case SALAMANDRA_GENERATOR_DUMMY:
{ {
startQuestTimer("SALAMANDRA_SPAWN_DUMMY", 20000, null, world.getFirstPlayer(), true); startQuestTimer("SALAMANDRA_SPAWN_DUMMY", 20000, npc, world.getFirstPlayer(), true);
break; break;
} }
case DEMINSIONAL_INVISIBLE_FRAGMENT: case DEMINSIONAL_INVISIBLE_FRAGMENT:
@ -758,8 +753,8 @@ public class DimensionalWrap extends AbstractInstance
protected void clean(PlayerInstance player) protected void clean(PlayerInstance player)
{ {
cancelQuestTimer("SWITCH_STAGE", null, player); cancelQuestTimer("SWITCH_STAGE", null, player);
cancelQuestTimer("SALAMANDRA_SPAWN", null, player); // cancelQuestTimer("SALAMANDRA_SPAWN", null, player);
cancelQuestTimer("SALAMANDRA_SPAWN_DUMMY", null, player); // cancelQuestTimer("SALAMANDRA_SPAWN_DUMMY", null, player);
cancelQuestTimer("CHANGE_LOCATION", null, player); cancelQuestTimer("CHANGE_LOCATION", null, player);
cancelQuestTimer("DEBUFF_TASK", null, player); cancelQuestTimer("DEBUFF_TASK", null, player);
} }

13
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java vendored
View File

@ -303,7 +303,6 @@ public class DimensionalWrap extends AbstractInstance
htmltext = "33975-05.html"; htmltext = "33975-05.html";
break; break;
} }
for (Npc n : world.getAliveNpcs()) for (Npc n : world.getAliveNpcs())
{ {
if (n.getId() != EINSTER) if (n.getId() != EINSTER)
@ -342,7 +341,6 @@ public class DimensionalWrap extends AbstractInstance
htmltext = "33975-05.html"; htmltext = "33975-05.html";
break; break;
} }
for (Npc n : world.getAliveNpcs()) for (Npc n : world.getAliveNpcs())
{ {
if (n.getId() != EINSTER) if (n.getId() != EINSTER)
@ -381,7 +379,6 @@ public class DimensionalWrap extends AbstractInstance
htmltext = "33975-05.html"; htmltext = "33975-05.html";
break; break;
} }
for (Npc n : world.getAliveNpcs()) for (Npc n : world.getAliveNpcs())
{ {
if (n.getId() != EINSTER) if (n.getId() != EINSTER)
@ -420,7 +417,6 @@ public class DimensionalWrap extends AbstractInstance
htmltext = "33975-05.html"; htmltext = "33975-05.html";
break; break;
} }
for (Npc n : world.getAliveNpcs()) for (Npc n : world.getAliveNpcs())
{ {
if (n.getId() != EINSTER) if (n.getId() != EINSTER)
@ -459,7 +455,6 @@ public class DimensionalWrap extends AbstractInstance
htmltext = "33975-05.html"; htmltext = "33975-05.html";
break; break;
} }
for (Npc n : world.getAliveNpcs()) for (Npc n : world.getAliveNpcs())
{ {
if (n.getId() != EINSTER) if (n.getId() != EINSTER)
@ -706,13 +701,13 @@ public class DimensionalWrap extends AbstractInstance
{ {
case SALAMANDRA_GENERATOR: case SALAMANDRA_GENERATOR:
{ {
startQuestTimer("SALAMANDRA_SPAWN", 25000, null, world.getFirstPlayer(), true); startQuestTimer("SALAMANDRA_SPAWN", 25000, npc, world.getFirstPlayer(), true);
startQuestTimer("CHANGE_LOCATION", 60000 - (world.getParameters().getInt("worldState", 0) * 1300), null, world.getFirstPlayer()); startQuestTimer("CHANGE_LOCATION", 60000 - (world.getParameters().getInt("worldState", 0) * 1300), null, world.getFirstPlayer());
break; break;
} }
case SALAMANDRA_GENERATOR_DUMMY: case SALAMANDRA_GENERATOR_DUMMY:
{ {
startQuestTimer("SALAMANDRA_SPAWN_DUMMY", 20000, null, world.getFirstPlayer(), true); startQuestTimer("SALAMANDRA_SPAWN_DUMMY", 20000, npc, world.getFirstPlayer(), true);
break; break;
} }
case DEMINSIONAL_INVISIBLE_FRAGMENT: case DEMINSIONAL_INVISIBLE_FRAGMENT:
@ -758,8 +753,8 @@ public class DimensionalWrap extends AbstractInstance
protected void clean(PlayerInstance player) protected void clean(PlayerInstance player)
{ {
cancelQuestTimer("SWITCH_STAGE", null, player); cancelQuestTimer("SWITCH_STAGE", null, player);
cancelQuestTimer("SALAMANDRA_SPAWN", null, player); // cancelQuestTimer("SALAMANDRA_SPAWN", null, player);
cancelQuestTimer("SALAMANDRA_SPAWN_DUMMY", null, player); // cancelQuestTimer("SALAMANDRA_SPAWN_DUMMY", null, player);
cancelQuestTimer("CHANGE_LOCATION", null, player); cancelQuestTimer("CHANGE_LOCATION", null, player);
cancelQuestTimer("DEBUFF_TASK", null, player); cancelQuestTimer("DEBUFF_TASK", null, player);
} }

13
L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java vendored
View File

@ -303,7 +303,6 @@ public class DimensionalWrap extends AbstractInstance
htmltext = "33975-05.html"; htmltext = "33975-05.html";
break; break;
} }
for (Npc n : world.getAliveNpcs()) for (Npc n : world.getAliveNpcs())
{ {
if (n.getId() != EINSTER) if (n.getId() != EINSTER)
@ -342,7 +341,6 @@ public class DimensionalWrap extends AbstractInstance
htmltext = "33975-05.html"; htmltext = "33975-05.html";
break; break;
} }
for (Npc n : world.getAliveNpcs()) for (Npc n : world.getAliveNpcs())
{ {
if (n.getId() != EINSTER) if (n.getId() != EINSTER)
@ -381,7 +379,6 @@ public class DimensionalWrap extends AbstractInstance
htmltext = "33975-05.html"; htmltext = "33975-05.html";
break; break;
} }
for (Npc n : world.getAliveNpcs()) for (Npc n : world.getAliveNpcs())
{ {
if (n.getId() != EINSTER) if (n.getId() != EINSTER)
@ -420,7 +417,6 @@ public class DimensionalWrap extends AbstractInstance
htmltext = "33975-05.html"; htmltext = "33975-05.html";
break; break;
} }
for (Npc n : world.getAliveNpcs()) for (Npc n : world.getAliveNpcs())
{ {
if (n.getId() != EINSTER) if (n.getId() != EINSTER)
@ -459,7 +455,6 @@ public class DimensionalWrap extends AbstractInstance
htmltext = "33975-05.html"; htmltext = "33975-05.html";
break; break;
} }
for (Npc n : world.getAliveNpcs()) for (Npc n : world.getAliveNpcs())
{ {
if (n.getId() != EINSTER) if (n.getId() != EINSTER)
@ -706,13 +701,13 @@ public class DimensionalWrap extends AbstractInstance
{ {
case SALAMANDRA_GENERATOR: case SALAMANDRA_GENERATOR:
{ {
startQuestTimer("SALAMANDRA_SPAWN", 25000, null, world.getFirstPlayer(), true); startQuestTimer("SALAMANDRA_SPAWN", 25000, npc, world.getFirstPlayer(), true);
startQuestTimer("CHANGE_LOCATION", 60000 - (world.getParameters().getInt("worldState", 0) * 1300), null, world.getFirstPlayer()); startQuestTimer("CHANGE_LOCATION", 60000 - (world.getParameters().getInt("worldState", 0) * 1300), null, world.getFirstPlayer());
break; break;
} }
case SALAMANDRA_GENERATOR_DUMMY: case SALAMANDRA_GENERATOR_DUMMY:
{ {
startQuestTimer("SALAMANDRA_SPAWN_DUMMY", 20000, null, world.getFirstPlayer(), true); startQuestTimer("SALAMANDRA_SPAWN_DUMMY", 20000, npc, world.getFirstPlayer(), true);
break; break;
} }
case DEMINSIONAL_INVISIBLE_FRAGMENT: case DEMINSIONAL_INVISIBLE_FRAGMENT:
@ -758,8 +753,8 @@ public class DimensionalWrap extends AbstractInstance
protected void clean(PlayerInstance player) protected void clean(PlayerInstance player)
{ {
cancelQuestTimer("SWITCH_STAGE", null, player); cancelQuestTimer("SWITCH_STAGE", null, player);
cancelQuestTimer("SALAMANDRA_SPAWN", null, player); // cancelQuestTimer("SALAMANDRA_SPAWN", null, player);
cancelQuestTimer("SALAMANDRA_SPAWN_DUMMY", null, player); // cancelQuestTimer("SALAMANDRA_SPAWN_DUMMY", null, player);
cancelQuestTimer("CHANGE_LOCATION", null, player); cancelQuestTimer("CHANGE_LOCATION", null, player);
cancelQuestTimer("DEBUFF_TASK", null, player); cancelQuestTimer("DEBUFF_TASK", null, player);
} }

13
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java vendored
View File

@ -303,7 +303,6 @@ public class DimensionalWrap extends AbstractInstance
htmltext = "33975-05.html"; htmltext = "33975-05.html";
break; break;
} }
for (Npc n : world.getAliveNpcs()) for (Npc n : world.getAliveNpcs())
{ {
if (n.getId() != EINSTER) if (n.getId() != EINSTER)
@ -342,7 +341,6 @@ public class DimensionalWrap extends AbstractInstance
htmltext = "33975-05.html"; htmltext = "33975-05.html";
break; break;
} }
for (Npc n : world.getAliveNpcs()) for (Npc n : world.getAliveNpcs())
{ {
if (n.getId() != EINSTER) if (n.getId() != EINSTER)
@ -381,7 +379,6 @@ public class DimensionalWrap extends AbstractInstance
htmltext = "33975-05.html"; htmltext = "33975-05.html";
break; break;
} }
for (Npc n : world.getAliveNpcs()) for (Npc n : world.getAliveNpcs())
{ {
if (n.getId() != EINSTER) if (n.getId() != EINSTER)
@ -420,7 +417,6 @@ public class DimensionalWrap extends AbstractInstance
htmltext = "33975-05.html"; htmltext = "33975-05.html";
break; break;
} }
for (Npc n : world.getAliveNpcs()) for (Npc n : world.getAliveNpcs())
{ {
if (n.getId() != EINSTER) if (n.getId() != EINSTER)
@ -459,7 +455,6 @@ public class DimensionalWrap extends AbstractInstance
htmltext = "33975-05.html"; htmltext = "33975-05.html";
break; break;
} }
for (Npc n : world.getAliveNpcs()) for (Npc n : world.getAliveNpcs())
{ {
if (n.getId() != EINSTER) if (n.getId() != EINSTER)
@ -706,13 +701,13 @@ public class DimensionalWrap extends AbstractInstance
{ {
case SALAMANDRA_GENERATOR: case SALAMANDRA_GENERATOR:
{ {
startQuestTimer("SALAMANDRA_SPAWN", 25000, null, world.getFirstPlayer(), true); startQuestTimer("SALAMANDRA_SPAWN", 25000, npc, world.getFirstPlayer(), true);
startQuestTimer("CHANGE_LOCATION", 60000 - (world.getParameters().getInt("worldState", 0) * 1300), null, world.getFirstPlayer()); startQuestTimer("CHANGE_LOCATION", 60000 - (world.getParameters().getInt("worldState", 0) * 1300), null, world.getFirstPlayer());
break; break;
} }
case SALAMANDRA_GENERATOR_DUMMY: case SALAMANDRA_GENERATOR_DUMMY:
{ {
startQuestTimer("SALAMANDRA_SPAWN_DUMMY", 20000, null, world.getFirstPlayer(), true); startQuestTimer("SALAMANDRA_SPAWN_DUMMY", 20000, npc, world.getFirstPlayer(), true);
break; break;
} }
case DEMINSIONAL_INVISIBLE_FRAGMENT: case DEMINSIONAL_INVISIBLE_FRAGMENT:
@ -758,8 +753,8 @@ public class DimensionalWrap extends AbstractInstance
protected void clean(PlayerInstance player) protected void clean(PlayerInstance player)
{ {
cancelQuestTimer("SWITCH_STAGE", null, player); cancelQuestTimer("SWITCH_STAGE", null, player);
cancelQuestTimer("SALAMANDRA_SPAWN", null, player); // cancelQuestTimer("SALAMANDRA_SPAWN", null, player);
cancelQuestTimer("SALAMANDRA_SPAWN_DUMMY", null, player); // cancelQuestTimer("SALAMANDRA_SPAWN_DUMMY", null, player);
cancelQuestTimer("CHANGE_LOCATION", null, player); cancelQuestTimer("CHANGE_LOCATION", null, player);
cancelQuestTimer("DEBUFF_TASK", null, player); cancelQuestTimer("DEBUFF_TASK", null, player);
} }