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

Fixed unset global variables issue.

Browse Source
This commit is contained in:
MobiusDev 2017-08-16 00:51:49 +00:00
parent b4464a1da4
commit 29d69fc451
13 changed files with 40 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
L2J_Mobius_Classic/dist/game/data/scripts/ai/bosses/Core/Core.java vendored
View File

@ -83,8 +83,8 @@ public final class Core extends AbstractNpcAI
} }
else else
{ {
final String test = GlobalVariablesManager.getInstance().getString("Core_Attacked"); final boolean test = GlobalVariablesManager.getInstance().getBoolean("Core_Attacked", false);
if (test.equalsIgnoreCase("true")) if (test)
{ {
_firstAttacked = true; _firstAttacked = true;
} }
@ -103,7 +103,7 @@ public final class Core extends AbstractNpcAI
@Override @Override
public void onSave() public void onSave()
{ {
GlobalVariablesManager.getInstance().set("Core_Attacked", Boolean.toString(_firstAttacked)); GlobalVariablesManager.getInstance().set("Core_Attacked", _firstAttacked);
} }
public void spawnBoss(L2GrandBossInstance npc) public void spawnBoss(L2GrandBossInstance npc)

4
L2J_Mobius_Classic/readme.txt
View File

@ -29,7 +29,7 @@ What is done
-Quest Fishing Specialist's Request -Quest Fishing Specialist's Request
-Olympiad NPC updates -Olympiad NPC updates
-Dimensional Merchant updates -Dimensional Merchant updates
-Retail gatekeeper teleports -Classic gatekeeper teleports
-Admin menu teleport and shop cleanups -Admin menu teleport and shop cleanups
-Blacksmith NPC updates -Blacksmith NPC updates
-New Race Track arena zone -New Race Track arena zone
@ -39,6 +39,7 @@ What is done
-Moon Knight quest -Moon Knight quest
-Item augmentation support -Item augmentation support
-Retail Henna list -Retail Henna list
-Floran Agricultural Area clan halls
Custom work Custom work
-Newbie Helper NPC location info -Newbie Helper NPC location info
@ -50,7 +51,6 @@ TODO list
-Retail NPC dialogs -Retail NPC dialogs
-Retail NPC buylists -Retail NPC buylists
-Test quests and update rewards -Test quests and update rewards
-Test Floran Agricultural Area clan halls
-Test castle sieges -Test castle sieges
-Dungeon of Abyss https://www.youtube.com/watch?v=FZEu0hjCAK8 -Dungeon of Abyss https://www.youtube.com/watch?v=FZEu0hjCAK8
-New Savior class skills https://eu.4game.com/lineage2classic/play/saviors/classes/#newclasskills -New Savior class skills https://eu.4game.com/lineage2classic/play/saviors/classes/#newclasskills

8
L2J_Mobius_Helios/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java vendored
View File

@ -228,8 +228,8 @@ public final class SeedOfAnnihilation extends AbstractNpcAI
}); });
int buffsNow = 0; int buffsNow = 0;
final String var = GlobalVariablesManager.getInstance().getString("SeedNextStatusChange"); final Long var = GlobalVariablesManager.getInstance().getLong("SeedNextStatusChange", 0);
if (var.equalsIgnoreCase("") || (Long.parseLong(var) < System.currentTimeMillis())) if (var < System.currentTimeMillis())
{ {
buffsNow = getRandom(ZONE_BUFFS_LIST.length); buffsNow = getRandom(ZONE_BUFFS_LIST.length);
GlobalVariablesManager.getInstance().set("SeedBuffsList", String.valueOf(buffsNow)); GlobalVariablesManager.getInstance().set("SeedBuffsList", String.valueOf(buffsNow));
@ -238,8 +238,8 @@ public final class SeedOfAnnihilation extends AbstractNpcAI
} }
else else
{ {
_seedsNextStatusChange = Long.parseLong(var); _seedsNextStatusChange = var;
buffsNow = Integer.parseInt(GlobalVariablesManager.getInstance().getString("SeedBuffsList")); buffsNow = GlobalVariablesManager.getInstance().getInt("SeedBuffsList", 0);
} }
for (int i = 0; i < _regionsData.length; i++) for (int i = 0; i < _regionsData.length; i++)
{ {

6
L2J_Mobius_Helios/dist/game/data/scripts/ai/bosses/Core/Core.java vendored
View File

@ -83,8 +83,8 @@ public final class Core extends AbstractNpcAI
} }
else else
{ {
final String test = GlobalVariablesManager.getInstance().getString("Core_Attacked"); final boolean test = GlobalVariablesManager.getInstance().getBoolean("Core_Attacked", false);
if (test.equalsIgnoreCase("true")) if (test)
{ {
_firstAttacked = true; _firstAttacked = true;
} }
@ -103,7 +103,7 @@ public final class Core extends AbstractNpcAI
@Override @Override
public void onSave() public void onSave()
{ {
GlobalVariablesManager.getInstance().set("Core_Attacked", Boolean.toString(_firstAttacked)); GlobalVariablesManager.getInstance().set("Core_Attacked", _firstAttacked);
} }
public void spawnBoss(L2GrandBossInstance npc) public void spawnBoss(L2GrandBossInstance npc)

8
L2J_Mobius_Helios/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java vendored
View File

@ -52,9 +52,12 @@ public final class QueenShyeed extends AbstractNpcAI
switch (event) switch (event)
{ {
case "respawn": case "respawn":
{
spawnShyeed(); spawnShyeed();
break; break;
}
case "despawn": case "despawn":
{
if (!npc.isDead()) if (!npc.isDead())
{ {
npc.deleteMe(); npc.deleteMe();
@ -62,6 +65,7 @@ public final class QueenShyeed extends AbstractNpcAI
} }
break; break;
} }
}
return null; return null;
} }
@ -82,8 +86,8 @@ public final class QueenShyeed extends AbstractNpcAI
private void spawnShyeed() private void spawnShyeed()
{ {
final String respawn = GlobalVariablesManager.getInstance().getString("QueenShyeedRespawn"); final long respawn = GlobalVariablesManager.getInstance().getLong("QueenShyeedRespawn", 0);
final long remain = (!respawn.isEmpty()) ? Long.parseLong(respawn) - System.currentTimeMillis() : 0; final long remain = respawn != 0 ? respawn - System.currentTimeMillis() : 0;
if (remain > 0) if (remain > 0)
{ {
startQuestTimer("respawn", remain, null, null); startQuestTimer("respawn", remain, null, null);

6
L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/Core.java vendored
View File

@ -80,8 +80,8 @@ public final class Core extends AbstractNpcAI
} }
else else
{ {
final String test = GlobalVariablesManager.getInstance().getString("Core_Attacked"); final boolean test = GlobalVariablesManager.getInstance().getBoolean("Core_Attacked", false);
if (test.equalsIgnoreCase("true")) if (test)
{ {
_firstAttacked = true; _firstAttacked = true;
} }
@ -100,7 +100,7 @@ public final class Core extends AbstractNpcAI
@Override @Override
public void onSave() public void onSave()
{ {
GlobalVariablesManager.getInstance().set("Core_Attacked", Boolean.toString(_firstAttacked)); GlobalVariablesManager.getInstance().set("Core_Attacked", _firstAttacked);
} }
public void spawnBoss(L2GrandBossInstance npc) public void spawnBoss(L2GrandBossInstance npc)

4
L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/QueenShyeed.java vendored
View File

@ -87,8 +87,8 @@ public final class QueenShyeed extends AbstractNpcAI
private void spawnShyeed() private void spawnShyeed()
{ {
final String respawn = GlobalVariablesManager.getInstance().getString("QueenShyeedRespawn"); final long respawn = GlobalVariablesManager.getInstance().getLong("QueenShyeedRespawn", 0);
final long remain = !respawn.isEmpty() ? Long.parseLong(respawn) - System.currentTimeMillis() : 0; final long remain = respawn != 0 ? respawn - System.currentTimeMillis() : 0;
if (remain > 0) if (remain > 0)
{ {
startQuestTimer("respawn", remain, null, null); startQuestTimer("respawn", remain, null, null);

8
L2J_Mobius_HighFive/dist/game/data/scripts/gracia/AI/SeedOfAnnihilation/SeedOfAnnihilation.java vendored
View File

@ -227,8 +227,8 @@ public class SeedOfAnnihilation extends AbstractNpcAI
}); });
int buffsNow = 0; int buffsNow = 0;
final String var = GlobalVariablesManager.getInstance().getString("SeedNextStatusChange"); final Long var = GlobalVariablesManager.getInstance().getLong("SeedNextStatusChange", 0);
if (var.equalsIgnoreCase("") || (Long.parseLong(var) < System.currentTimeMillis())) if (var < System.currentTimeMillis())
{ {
buffsNow = getRandom(ZONE_BUFFS_LIST.length); buffsNow = getRandom(ZONE_BUFFS_LIST.length);
GlobalVariablesManager.getInstance().set("SeedBuffsList", String.valueOf(buffsNow)); GlobalVariablesManager.getInstance().set("SeedBuffsList", String.valueOf(buffsNow));
@ -237,8 +237,8 @@ public class SeedOfAnnihilation extends AbstractNpcAI
} }
else else
{ {
_seedsNextStatusChange = Long.parseLong(var); _seedsNextStatusChange = var;
buffsNow = Integer.parseInt(GlobalVariablesManager.getInstance().getString("SeedBuffsList")); buffsNow = GlobalVariablesManager.getInstance().getInt("SeedBuffsList", 0);
} }
for (int i = 0; i < _regionsData.length; i++) for (int i = 0; i < _regionsData.length; i++)
{ {

4
L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q00610_MagicalPowerOfWaterPart2/Q00610_MagicalPowerOfWaterPart2.java vendored
View File

@ -53,8 +53,8 @@ public class Q00610_MagicalPowerOfWaterPart2 extends Quest
addKillId(ASHUTAR); addKillId(ASHUTAR);
registerQuestItems(GREEN_TOTEM, ASHUTAR_HEART); registerQuestItems(GREEN_TOTEM, ASHUTAR_HEART);
final String test = GlobalVariablesManager.getInstance().getString("Q00610_respawn"); final long test = GlobalVariablesManager.getInstance().getLong("Q00610_respawn", 0);
final long remain = (!test.isEmpty()) ? (Long.parseLong(test) - System.currentTimeMillis()) : 0; final long remain = test != 0 ? test - System.currentTimeMillis() : 0;
if (remain > 0) if (remain > 0)
{ {
startQuestTimer("spawn_npc", remain, null, null); startQuestTimer("spawn_npc", remain, null, null);

4
L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q00616_MagicalPowerOfFirePart2/Q00616_MagicalPowerOfFirePart2.java vendored
View File

@ -53,8 +53,8 @@ public class Q00616_MagicalPowerOfFirePart2 extends Quest
addKillId(NASTRON); addKillId(NASTRON);
registerQuestItems(RED_TOTEM, NASTRON_HEART); registerQuestItems(RED_TOTEM, NASTRON_HEART);
final String test = GlobalVariablesManager.getInstance().getString("Q00616_respawn"); final long test = GlobalVariablesManager.getInstance().getLong("Q00616_respawn", 0);
final long remain = (!test.isEmpty()) ? (Long.parseLong(test) - System.currentTimeMillis()) : 0; final long remain = test != 0 ? test - System.currentTimeMillis() : 0;
if (remain > 0) if (remain > 0)
{ {
startQuestTimer("spawn_npc", remain, null, null); startQuestTimer("spawn_npc", remain, null, null);

8
L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java vendored
View File

@ -228,8 +228,8 @@ public final class SeedOfAnnihilation extends AbstractNpcAI
}); });
int buffsNow = 0; int buffsNow = 0;
final String var = GlobalVariablesManager.getInstance().getString("SeedNextStatusChange"); final Long var = GlobalVariablesManager.getInstance().getLong("SeedNextStatusChange", 0);
if (var.equalsIgnoreCase("") || (Long.parseLong(var) < System.currentTimeMillis())) if (var < System.currentTimeMillis())
{ {
buffsNow = getRandom(ZONE_BUFFS_LIST.length); buffsNow = getRandom(ZONE_BUFFS_LIST.length);
GlobalVariablesManager.getInstance().set("SeedBuffsList", String.valueOf(buffsNow)); GlobalVariablesManager.getInstance().set("SeedBuffsList", String.valueOf(buffsNow));
@ -238,8 +238,8 @@ public final class SeedOfAnnihilation extends AbstractNpcAI
} }
else else
{ {
_seedsNextStatusChange = Long.parseLong(var); _seedsNextStatusChange = var;
buffsNow = Integer.parseInt(GlobalVariablesManager.getInstance().getString("SeedBuffsList")); buffsNow = GlobalVariablesManager.getInstance().getInt("SeedBuffsList", 0);
} }
for (int i = 0; i < _regionsData.length; i++) for (int i = 0; i < _regionsData.length; i++)
{ {

6
L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Core/Core.java vendored
View File

@ -83,8 +83,8 @@ public final class Core extends AbstractNpcAI
} }
else else
{ {
final String test = GlobalVariablesManager.getInstance().getString("Core_Attacked"); final boolean test = GlobalVariablesManager.getInstance().getBoolean("Core_Attacked", false);
if (test.equalsIgnoreCase("true")) if (test)
{ {
_firstAttacked = true; _firstAttacked = true;
} }
@ -103,7 +103,7 @@ public final class Core extends AbstractNpcAI
@Override @Override
public void onSave() public void onSave()
{ {
GlobalVariablesManager.getInstance().set("Core_Attacked", Boolean.toString(_firstAttacked)); GlobalVariablesManager.getInstance().set("Core_Attacked", _firstAttacked);
} }
public void spawnBoss(L2GrandBossInstance npc) public void spawnBoss(L2GrandBossInstance npc)

4
L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java vendored
View File

@ -82,8 +82,8 @@ public final class QueenShyeed extends AbstractNpcAI
private void spawnShyeed() private void spawnShyeed()
{ {
final String respawn = GlobalVariablesManager.getInstance().getString("QueenShyeedRespawn"); final long respawn = GlobalVariablesManager.getInstance().getLong("QueenShyeedRespawn", 0);
final long remain = (!respawn.isEmpty()) ? Long.parseLong(respawn) - System.currentTimeMillis() : 0; final long remain = respawn != 0 ? respawn - System.currentTimeMillis() : 0;
if (remain > 0) if (remain > 0)
{ {
startQuestTimer("respawn", remain, null, null); startQuestTimer("respawn", remain, null, null);