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

Additional corrections for ClanStrongholdDevice getOrDefault usages.

Browse Source
This commit is contained in:
MobiusDevelopment 2022-12-03 00:31:42 +00:00
parent a9941ed915
commit 25144e4868
4 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/ClanStrongholdDevice/ClanStrongholdDevice.java vendored
View File

@ -127,7 +127,8 @@ public class ClanStrongholdDevice extends AbstractNpcAI
{
return super.onFirstTalk(npc, player);
}
return npc.getId() + (CURRENT_CLAN_ID.getOrDefault(npc.getScriptValue(), 0) == 0 ? "" : "C") + ".htm";
return npc.getId() + (CURRENT_CLAN_ID.containsKey(npc.getScriptValue()) ? "C" : "") + ".htm";
}
@Override
@ -167,7 +168,7 @@ public class ClanStrongholdDevice extends AbstractNpcAI
@Override
public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon)
{
if (CURRENT_CLAN_ID.containsKey(npc.getScriptValue()) && (LAST_ATTACK.getOrDefault(npc.getObjectId(), 0L) < (System.currentTimeMillis() - 5000L)))
if (CURRENT_CLAN_ID.containsKey(npc.getScriptValue()) && (LAST_ATTACK.getOrDefault(npc.getObjectId(), 0L) < (System.currentTimeMillis() - 5000)))
{
npc.broadcastPacket(new NpcSay(npc, ChatType.NPC_GENERAL, NpcStringId.AT_TACK_SIG_NAL_DE_TEC_TED_S1).addStringParameter(attacker.getName()));
LAST_ATTACK.put(npc.getObjectId(), System.currentTimeMillis());
@ -187,7 +188,7 @@ public class ClanStrongholdDevice extends AbstractNpcAI
return super.onKill(npc, killer, isSummon);
}
if (CURRENT_CLAN_ID.getOrDefault(killer.getClanId(), 0) == 0)
if (!CURRENT_CLAN_ID.containsKey(killer.getClanId()))
{
return super.onKill(npc, killer, isSummon);
}

7
L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/ClanStrongholdDevice/ClanStrongholdDevice.java vendored
View File

@ -127,7 +127,8 @@ public class ClanStrongholdDevice extends AbstractNpcAI
{
return super.onFirstTalk(npc, player);
}
return npc.getId() + (CURRENT_CLAN_ID.getOrDefault(npc.getScriptValue(), 0) == 0 ? "" : "C") + ".htm";
return npc.getId() + (CURRENT_CLAN_ID.containsKey(npc.getScriptValue()) ? "C" : "") + ".htm";
}
@Override
@ -167,7 +168,7 @@ public class ClanStrongholdDevice extends AbstractNpcAI
@Override
public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon)
{
if (CURRENT_CLAN_ID.containsKey(npc.getScriptValue()) && (LAST_ATTACK.getOrDefault(npc.getObjectId(), 0L) < (System.currentTimeMillis() - 5000L)))
if (CURRENT_CLAN_ID.containsKey(npc.getScriptValue()) && (LAST_ATTACK.getOrDefault(npc.getObjectId(), 0L) < (System.currentTimeMillis() - 5000)))
{
npc.broadcastPacket(new NpcSay(npc, ChatType.NPC_GENERAL, NpcStringId.AT_TACK_SIG_NAL_DE_TEC_TED_S1).addStringParameter(attacker.getName()));
LAST_ATTACK.put(npc.getObjectId(), System.currentTimeMillis());
@ -187,7 +188,7 @@ public class ClanStrongholdDevice extends AbstractNpcAI
return super.onKill(npc, killer, isSummon);
}
if (CURRENT_CLAN_ID.getOrDefault(killer.getClanId(), 0) == 0)
if (!CURRENT_CLAN_ID.containsKey(killer.getClanId()))
{
return super.onKill(npc, killer, isSummon);
}

7
L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/ai/others/ClanStrongholdDevice/ClanStrongholdDevice.java vendored
View File

@ -127,7 +127,8 @@ public class ClanStrongholdDevice extends AbstractNpcAI
{
return super.onFirstTalk(npc, player);
}
return npc.getId() + (CURRENT_CLAN_ID.getOrDefault(npc.getScriptValue(), 0) == 0 ? "" : "C") + ".htm";
return npc.getId() + (CURRENT_CLAN_ID.containsKey(npc.getScriptValue()) ? "C" : "") + ".htm";
}
@Override
@ -167,7 +168,7 @@ public class ClanStrongholdDevice extends AbstractNpcAI
@Override
public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon)
{
if (CURRENT_CLAN_ID.containsKey(npc.getScriptValue()) && (LAST_ATTACK.getOrDefault(npc.getObjectId(), 0L) < (System.currentTimeMillis() - 5000L)))
if (CURRENT_CLAN_ID.containsKey(npc.getScriptValue()) && (LAST_ATTACK.getOrDefault(npc.getObjectId(), 0L) < (System.currentTimeMillis() - 5000)))
{
npc.broadcastPacket(new NpcSay(npc, ChatType.NPC_GENERAL, NpcStringId.AT_TACK_SIG_NAL_DE_TEC_TED_S1).addStringParameter(attacker.getName()));
LAST_ATTACK.put(npc.getObjectId(), System.currentTimeMillis());
@ -187,7 +188,7 @@ public class ClanStrongholdDevice extends AbstractNpcAI
return super.onKill(npc, killer, isSummon);
}
if (CURRENT_CLAN_ID.getOrDefault(killer.getClanId(), 0) == 0)
if (!CURRENT_CLAN_ID.containsKey(killer.getClanId()))
{
return super.onKill(npc, killer, isSummon);
}

7
L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/ClanStrongholdDevice/ClanStrongholdDevice.java vendored
View File

@ -127,7 +127,8 @@ public class ClanStrongholdDevice extends AbstractNpcAI
{
return super.onFirstTalk(npc, player);
}
return npc.getId() + (CURRENT_CLAN_ID.getOrDefault(npc.getScriptValue(), 0) == 0 ? "" : "C") + ".htm";
return npc.getId() + (CURRENT_CLAN_ID.containsKey(npc.getScriptValue()) ? "C" : "") + ".htm";
}
@Override
@ -167,7 +168,7 @@ public class ClanStrongholdDevice extends AbstractNpcAI
@Override
public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon)
{
if (CURRENT_CLAN_ID.containsKey(npc.getScriptValue()) && (LAST_ATTACK.getOrDefault(npc.getObjectId(), 0L) < (System.currentTimeMillis() - 5000L)))
if (CURRENT_CLAN_ID.containsKey(npc.getScriptValue()) && (LAST_ATTACK.getOrDefault(npc.getObjectId(), 0L) < (System.currentTimeMillis() - 5000)))
{
npc.broadcastPacket(new NpcSay(npc, ChatType.NPC_GENERAL, NpcStringId.AT_TACK_SIG_NAL_DE_TEC_TED_S1).addStringParameter(attacker.getName()));
LAST_ATTACK.put(npc.getObjectId(), System.currentTimeMillis());
@ -187,7 +188,7 @@ public class ClanStrongholdDevice extends AbstractNpcAI
return super.onKill(npc, killer, isSummon);
}
if (CURRENT_CLAN_ID.getOrDefault(killer.getClanId(), 0) == 0)
if (!CURRENT_CLAN_ID.containsKey(killer.getClanId()))
{
return super.onKill(npc, killer, isSummon);
}