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

Prevent SiegeGuards AI onKill NPE.

Browse Source
This commit is contained in:
MobiusDevelopment 2020-02-11 07:03:13 +00:00
parent efc607fc81
commit 220e0b716c
17 changed files with 34 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/SiegeGuards.java vendored
View File

@ -202,7 +202,8 @@ public class SiegeGuards extends AbstractNpcAI
@Override
public String onKill(Npc npc, PlayerInstance killer, boolean isSummon)
{
RESIDENCE_GUARD_MAP.get(npc.getScriptValue()).remove(npc);
final int residenceId = npc.getScriptValue();
RESIDENCE_GUARD_MAP.get(RESIDENCE_GUARD_MAP.containsKey(residenceId) ? residenceId : 0).remove(npc);
return super.onKill(npc, killer, isSummon);
}

3
L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/SiegeGuards.java vendored
View File

@ -202,7 +202,8 @@ public class SiegeGuards extends AbstractNpcAI
@Override
public String onKill(Npc npc, PlayerInstance killer, boolean isSummon)
{
RESIDENCE_GUARD_MAP.get(npc.getScriptValue()).remove(npc);
final int residenceId = npc.getScriptValue();
RESIDENCE_GUARD_MAP.get(RESIDENCE_GUARD_MAP.containsKey(residenceId) ? residenceId : 0).remove(npc);
return super.onKill(npc, killer, isSummon);
}

3
L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/SiegeGuards.java vendored
View File

@ -202,7 +202,8 @@ public class SiegeGuards extends AbstractNpcAI
@Override
public String onKill(Npc npc, PlayerInstance killer, boolean isSummon)
{
RESIDENCE_GUARD_MAP.get(npc.getScriptValue()).remove(npc);
final int residenceId = npc.getScriptValue();
RESIDENCE_GUARD_MAP.get(RESIDENCE_GUARD_MAP.containsKey(residenceId) ? residenceId : 0).remove(npc);
return super.onKill(npc, killer, isSummon);
}

3
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/SiegeGuards.java vendored
View File

@ -202,7 +202,8 @@ public class SiegeGuards extends AbstractNpcAI
@Override
public String onKill(Npc npc, PlayerInstance killer, boolean isSummon)
{
RESIDENCE_GUARD_MAP.get(npc.getScriptValue()).remove(npc);
final int residenceId = npc.getScriptValue();
RESIDENCE_GUARD_MAP.get(RESIDENCE_GUARD_MAP.containsKey(residenceId) ? residenceId : 0).remove(npc);
return super.onKill(npc, killer, isSummon);
}

3
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/SiegeGuards.java vendored
View File

@ -202,7 +202,8 @@ public class SiegeGuards extends AbstractNpcAI
@Override
public String onKill(Npc npc, PlayerInstance killer, boolean isSummon)
{
RESIDENCE_GUARD_MAP.get(npc.getScriptValue()).remove(npc);
final int residenceId = npc.getScriptValue();
RESIDENCE_GUARD_MAP.get(RESIDENCE_GUARD_MAP.containsKey(residenceId) ? residenceId : 0).remove(npc);
return super.onKill(npc, killer, isSummon);
}

3
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/SiegeGuards.java vendored
View File

@ -202,7 +202,8 @@ public class SiegeGuards extends AbstractNpcAI
@Override
public String onKill(Npc npc, PlayerInstance killer, boolean isSummon)
{
RESIDENCE_GUARD_MAP.get(npc.getScriptValue()).remove(npc);
final int residenceId = npc.getScriptValue();
RESIDENCE_GUARD_MAP.get(RESIDENCE_GUARD_MAP.containsKey(residenceId) ? residenceId : 0).remove(npc);
return super.onKill(npc, killer, isSummon);
}

3
L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/SiegeGuards.java vendored
View File

@ -202,7 +202,8 @@ public class SiegeGuards extends AbstractNpcAI
@Override
public String onKill(Npc npc, PlayerInstance killer, boolean isSummon)
{
RESIDENCE_GUARD_MAP.get(npc.getScriptValue()).remove(npc);
final int residenceId = npc.getScriptValue();
RESIDENCE_GUARD_MAP.get(RESIDENCE_GUARD_MAP.containsKey(residenceId) ? residenceId : 0).remove(npc);
return super.onKill(npc, killer, isSummon);
}

3
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/SiegeGuards.java vendored
View File

@ -202,7 +202,8 @@ public class SiegeGuards extends AbstractNpcAI
@Override
public String onKill(Npc npc, PlayerInstance killer, boolean isSummon)
{
RESIDENCE_GUARD_MAP.get(npc.getScriptValue()).remove(npc);
final int residenceId = npc.getScriptValue();
RESIDENCE_GUARD_MAP.get(RESIDENCE_GUARD_MAP.containsKey(residenceId) ? residenceId : 0).remove(npc);
return super.onKill(npc, killer, isSummon);
}

3
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/SiegeGuards.java vendored
View File

@ -202,7 +202,8 @@ public class SiegeGuards extends AbstractNpcAI
@Override
public String onKill(Npc npc, PlayerInstance killer, boolean isSummon)
{
RESIDENCE_GUARD_MAP.get(npc.getScriptValue()).remove(npc);
final int residenceId = npc.getScriptValue();
RESIDENCE_GUARD_MAP.get(RESIDENCE_GUARD_MAP.containsKey(residenceId) ? residenceId : 0).remove(npc);
return super.onKill(npc, killer, isSummon);
}

3
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SiegeGuards.java vendored
View File

@ -202,7 +202,8 @@ public class SiegeGuards extends AbstractNpcAI
@Override
public String onKill(Npc npc, PlayerInstance killer, boolean isSummon)
{
RESIDENCE_GUARD_MAP.get(npc.getScriptValue()).remove(npc);
final int residenceId = npc.getScriptValue();
RESIDENCE_GUARD_MAP.get(RESIDENCE_GUARD_MAP.containsKey(residenceId) ? residenceId : 0).remove(npc);
return super.onKill(npc, killer, isSummon);
}

3
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/SiegeGuards.java vendored
View File

@ -166,7 +166,8 @@ public class SiegeGuards extends AbstractNpcAI
@Override
public String onKill(Npc npc, PlayerInstance killer, boolean isSummon)
{
RESIDENCE_GUARD_MAP.get(npc.getScriptValue()).remove(npc);
final int residenceId = npc.getScriptValue();
RESIDENCE_GUARD_MAP.get(RESIDENCE_GUARD_MAP.containsKey(residenceId) ? residenceId : 0).remove(npc);
return super.onKill(npc, killer, isSummon);
}

3
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/SiegeGuards.java vendored
View File

@ -166,7 +166,8 @@ public class SiegeGuards extends AbstractNpcAI
@Override
public String onKill(Npc npc, PlayerInstance killer, boolean isSummon)
{
RESIDENCE_GUARD_MAP.get(npc.getScriptValue()).remove(npc);
final int residenceId = npc.getScriptValue();
RESIDENCE_GUARD_MAP.get(RESIDENCE_GUARD_MAP.containsKey(residenceId) ? residenceId : 0).remove(npc);
return super.onKill(npc, killer, isSummon);
}

3
L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/SiegeGuards.java vendored
View File

@ -166,7 +166,8 @@ public class SiegeGuards extends AbstractNpcAI
@Override
public String onKill(Npc npc, PlayerInstance killer, boolean isSummon)
{
RESIDENCE_GUARD_MAP.get(npc.getScriptValue()).remove(npc);
final int residenceId = npc.getScriptValue();
RESIDENCE_GUARD_MAP.get(RESIDENCE_GUARD_MAP.containsKey(residenceId) ? residenceId : 0).remove(npc);
return super.onKill(npc, killer, isSummon);
}

3
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/SiegeGuards.java vendored
View File

@ -166,7 +166,8 @@ public class SiegeGuards extends AbstractNpcAI
@Override
public String onKill(Npc npc, PlayerInstance killer, boolean isSummon)
{
RESIDENCE_GUARD_MAP.get(npc.getScriptValue()).remove(npc);
final int residenceId = npc.getScriptValue();
RESIDENCE_GUARD_MAP.get(RESIDENCE_GUARD_MAP.containsKey(residenceId) ? residenceId : 0).remove(npc);
return super.onKill(npc, killer, isSummon);
}

3
L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/others/SiegeGuards.java vendored
View File

@ -166,7 +166,8 @@ public class SiegeGuards extends AbstractNpcAI
@Override
public String onKill(Npc npc, PlayerInstance killer, boolean isSummon)
{
RESIDENCE_GUARD_MAP.get(npc.getScriptValue()).remove(npc);
final int residenceId = npc.getScriptValue();
RESIDENCE_GUARD_MAP.get(RESIDENCE_GUARD_MAP.containsKey(residenceId) ? residenceId : 0).remove(npc);
return super.onKill(npc, killer, isSummon);
}

3
L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/SiegeGuards.java vendored
View File

@ -166,7 +166,8 @@ public class SiegeGuards extends AbstractNpcAI
@Override
public String onKill(Npc npc, PlayerInstance killer, boolean isSummon)
{
RESIDENCE_GUARD_MAP.get(npc.getScriptValue()).remove(npc);
final int residenceId = npc.getScriptValue();
RESIDENCE_GUARD_MAP.get(RESIDENCE_GUARD_MAP.containsKey(residenceId) ? residenceId : 0).remove(npc);
return super.onKill(npc, killer, isSummon);
}

3
L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/SiegeGuards.java vendored
View File

@ -166,7 +166,8 @@ public class SiegeGuards extends AbstractNpcAI
@Override
public String onKill(Npc npc, PlayerInstance killer, boolean isSummon)
{
RESIDENCE_GUARD_MAP.get(npc.getScriptValue()).remove(npc);
final int residenceId = npc.getScriptValue();
RESIDENCE_GUARD_MAP.get(RESIDENCE_GUARD_MAP.containsKey(residenceId) ? residenceId : 0).remove(npc);
return super.onKill(npc, killer, isSummon);
}