From 29d69fc4513596893fe515fa5d7a5f523fb9d0ba Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Wed, 16 Aug 2017 00:51:49 +0000 Subject: [PATCH] Fixed unset global variables issue. --- .../dist/game/data/scripts/ai/bosses/Core/Core.java | 6 +++--- L2J_Mobius_Classic/readme.txt | 4 ++-- .../ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java | 8 ++++---- .../dist/game/data/scripts/ai/bosses/Core/Core.java | 6 +++--- .../data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java | 8 ++++++-- .../dist/game/data/scripts/ai/individual/Core.java | 6 +++--- .../dist/game/data/scripts/ai/individual/QueenShyeed.java | 4 ++-- .../gracia/AI/SeedOfAnnihilation/SeedOfAnnihilation.java | 8 ++++---- .../Q00610_MagicalPowerOfWaterPart2.java | 4 ++-- .../Q00616_MagicalPowerOfFirePart2.java | 4 ++-- .../ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java | 8 ++++---- .../dist/game/data/scripts/ai/bosses/Core/Core.java | 6 +++--- .../data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java | 4 ++-- 13 files changed, 40 insertions(+), 36 deletions(-) diff --git a/L2J_Mobius_Classic/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_Classic/dist/game/data/scripts/ai/bosses/Core/Core.java index 514373848c..bc73947590 100644 --- a/L2J_Mobius_Classic/dist/game/data/scripts/ai/bosses/Core/Core.java +++ b/L2J_Mobius_Classic/dist/game/data/scripts/ai/bosses/Core/Core.java @@ -83,8 +83,8 @@ public final class Core extends AbstractNpcAI } else { - final String test = GlobalVariablesManager.getInstance().getString("Core_Attacked"); - if (test.equalsIgnoreCase("true")) + final boolean test = GlobalVariablesManager.getInstance().getBoolean("Core_Attacked", false); + if (test) { _firstAttacked = true; } @@ -103,7 +103,7 @@ public final class Core extends AbstractNpcAI @Override public void onSave() { - GlobalVariablesManager.getInstance().set("Core_Attacked", Boolean.toString(_firstAttacked)); + GlobalVariablesManager.getInstance().set("Core_Attacked", _firstAttacked); } public void spawnBoss(L2GrandBossInstance npc) diff --git a/L2J_Mobius_Classic/readme.txt b/L2J_Mobius_Classic/readme.txt index 5402beb374..00209e1f16 100644 --- a/L2J_Mobius_Classic/readme.txt +++ b/L2J_Mobius_Classic/readme.txt @@ -29,7 +29,7 @@ What is done -Quest Fishing Specialist's Request -Olympiad NPC updates -Dimensional Merchant updates --Retail gatekeeper teleports +-Classic gatekeeper teleports -Admin menu teleport and shop cleanups -Blacksmith NPC updates -New Race Track arena zone @@ -39,6 +39,7 @@ What is done -Moon Knight quest -Item augmentation support -Retail Henna list +-Floran Agricultural Area clan halls Custom work -Newbie Helper NPC location info @@ -50,7 +51,6 @@ TODO list -Retail NPC dialogs -Retail NPC buylists -Test quests and update rewards --Test Floran Agricultural Area clan halls -Test castle sieges -Dungeon of Abyss https://www.youtube.com/watch?v=FZEu0hjCAK8 -New Savior class skills https://eu.4game.com/lineage2classic/play/saviors/classes/#newclasskills diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java b/L2J_Mobius_Helios/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java index 92dd260901..cc9a31b203 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java +++ b/L2J_Mobius_Helios/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java @@ -228,8 +228,8 @@ public final class SeedOfAnnihilation extends AbstractNpcAI }); int buffsNow = 0; - final String var = GlobalVariablesManager.getInstance().getString("SeedNextStatusChange"); - if (var.equalsIgnoreCase("") || (Long.parseLong(var) < System.currentTimeMillis())) + final Long var = GlobalVariablesManager.getInstance().getLong("SeedNextStatusChange", 0); + if (var < System.currentTimeMillis()) { buffsNow = getRandom(ZONE_BUFFS_LIST.length); GlobalVariablesManager.getInstance().set("SeedBuffsList", String.valueOf(buffsNow)); @@ -238,8 +238,8 @@ public final class SeedOfAnnihilation extends AbstractNpcAI } else { - _seedsNextStatusChange = Long.parseLong(var); - buffsNow = Integer.parseInt(GlobalVariablesManager.getInstance().getString("SeedBuffsList")); + _seedsNextStatusChange = var; + buffsNow = GlobalVariablesManager.getInstance().getInt("SeedBuffsList", 0); } for (int i = 0; i < _regionsData.length; i++) { diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_Helios/dist/game/data/scripts/ai/bosses/Core/Core.java index 514373848c..bc73947590 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/ai/bosses/Core/Core.java +++ b/L2J_Mobius_Helios/dist/game/data/scripts/ai/bosses/Core/Core.java @@ -83,8 +83,8 @@ public final class Core extends AbstractNpcAI } else { - final String test = GlobalVariablesManager.getInstance().getString("Core_Attacked"); - if (test.equalsIgnoreCase("true")) + final boolean test = GlobalVariablesManager.getInstance().getBoolean("Core_Attacked", false); + if (test) { _firstAttacked = true; } @@ -103,7 +103,7 @@ public final class Core extends AbstractNpcAI @Override public void onSave() { - GlobalVariablesManager.getInstance().set("Core_Attacked", Boolean.toString(_firstAttacked)); + GlobalVariablesManager.getInstance().set("Core_Attacked", _firstAttacked); } public void spawnBoss(L2GrandBossInstance npc) diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java b/L2J_Mobius_Helios/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java index 0728cea727..69581a097c 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java +++ b/L2J_Mobius_Helios/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java @@ -52,15 +52,19 @@ public final class QueenShyeed extends AbstractNpcAI switch (event) { case "respawn": + { spawnShyeed(); break; + } case "despawn": + { if (!npc.isDead()) { npc.deleteMe(); startRespawn(); } break; + } } return null; } @@ -82,8 +86,8 @@ public final class QueenShyeed extends AbstractNpcAI private void spawnShyeed() { - final String respawn = GlobalVariablesManager.getInstance().getString("QueenShyeedRespawn"); - final long remain = (!respawn.isEmpty()) ? Long.parseLong(respawn) - System.currentTimeMillis() : 0; + final long respawn = GlobalVariablesManager.getInstance().getLong("QueenShyeedRespawn", 0); + final long remain = respawn != 0 ? respawn - System.currentTimeMillis() : 0; if (remain > 0) { startQuestTimer("respawn", remain, null, null); diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/Core.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/Core.java index ffbf4da767..9c2b3ad53e 100644 --- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/Core.java +++ b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/Core.java @@ -80,8 +80,8 @@ public final class Core extends AbstractNpcAI } else { - final String test = GlobalVariablesManager.getInstance().getString("Core_Attacked"); - if (test.equalsIgnoreCase("true")) + final boolean test = GlobalVariablesManager.getInstance().getBoolean("Core_Attacked", false); + if (test) { _firstAttacked = true; } @@ -100,7 +100,7 @@ public final class Core extends AbstractNpcAI @Override public void onSave() { - GlobalVariablesManager.getInstance().set("Core_Attacked", Boolean.toString(_firstAttacked)); + GlobalVariablesManager.getInstance().set("Core_Attacked", _firstAttacked); } public void spawnBoss(L2GrandBossInstance npc) diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/QueenShyeed.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/QueenShyeed.java index ceecccca5a..aac8878255 100644 --- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/QueenShyeed.java +++ b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/QueenShyeed.java @@ -87,8 +87,8 @@ public final class QueenShyeed extends AbstractNpcAI private void spawnShyeed() { - final String respawn = GlobalVariablesManager.getInstance().getString("QueenShyeedRespawn"); - final long remain = !respawn.isEmpty() ? Long.parseLong(respawn) - System.currentTimeMillis() : 0; + final long respawn = GlobalVariablesManager.getInstance().getLong("QueenShyeedRespawn", 0); + final long remain = respawn != 0 ? respawn - System.currentTimeMillis() : 0; if (remain > 0) { startQuestTimer("respawn", remain, null, null); diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/gracia/AI/SeedOfAnnihilation/SeedOfAnnihilation.java b/L2J_Mobius_HighFive/dist/game/data/scripts/gracia/AI/SeedOfAnnihilation/SeedOfAnnihilation.java index 8f7790e257..78e28d6471 100644 --- a/L2J_Mobius_HighFive/dist/game/data/scripts/gracia/AI/SeedOfAnnihilation/SeedOfAnnihilation.java +++ b/L2J_Mobius_HighFive/dist/game/data/scripts/gracia/AI/SeedOfAnnihilation/SeedOfAnnihilation.java @@ -227,8 +227,8 @@ public class SeedOfAnnihilation extends AbstractNpcAI }); int buffsNow = 0; - final String var = GlobalVariablesManager.getInstance().getString("SeedNextStatusChange"); - if (var.equalsIgnoreCase("") || (Long.parseLong(var) < System.currentTimeMillis())) + final Long var = GlobalVariablesManager.getInstance().getLong("SeedNextStatusChange", 0); + if (var < System.currentTimeMillis()) { buffsNow = getRandom(ZONE_BUFFS_LIST.length); GlobalVariablesManager.getInstance().set("SeedBuffsList", String.valueOf(buffsNow)); @@ -237,8 +237,8 @@ public class SeedOfAnnihilation extends AbstractNpcAI } else { - _seedsNextStatusChange = Long.parseLong(var); - buffsNow = Integer.parseInt(GlobalVariablesManager.getInstance().getString("SeedBuffsList")); + _seedsNextStatusChange = var; + buffsNow = GlobalVariablesManager.getInstance().getInt("SeedBuffsList", 0); } for (int i = 0; i < _regionsData.length; i++) { diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q00610_MagicalPowerOfWaterPart2/Q00610_MagicalPowerOfWaterPart2.java b/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q00610_MagicalPowerOfWaterPart2/Q00610_MagicalPowerOfWaterPart2.java index 75a55fc6e4..cca15c1905 100644 --- a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q00610_MagicalPowerOfWaterPart2/Q00610_MagicalPowerOfWaterPart2.java +++ b/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q00610_MagicalPowerOfWaterPart2/Q00610_MagicalPowerOfWaterPart2.java @@ -53,8 +53,8 @@ public class Q00610_MagicalPowerOfWaterPart2 extends Quest addKillId(ASHUTAR); registerQuestItems(GREEN_TOTEM, ASHUTAR_HEART); - final String test = GlobalVariablesManager.getInstance().getString("Q00610_respawn"); - final long remain = (!test.isEmpty()) ? (Long.parseLong(test) - System.currentTimeMillis()) : 0; + final long test = GlobalVariablesManager.getInstance().getLong("Q00610_respawn", 0); + final long remain = test != 0 ? test - System.currentTimeMillis() : 0; if (remain > 0) { startQuestTimer("spawn_npc", remain, null, null); diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q00616_MagicalPowerOfFirePart2/Q00616_MagicalPowerOfFirePart2.java b/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q00616_MagicalPowerOfFirePart2/Q00616_MagicalPowerOfFirePart2.java index 7299816150..65cb4a2f7b 100644 --- a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q00616_MagicalPowerOfFirePart2/Q00616_MagicalPowerOfFirePart2.java +++ b/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q00616_MagicalPowerOfFirePart2/Q00616_MagicalPowerOfFirePart2.java @@ -53,8 +53,8 @@ public class Q00616_MagicalPowerOfFirePart2 extends Quest addKillId(NASTRON); registerQuestItems(RED_TOTEM, NASTRON_HEART); - final String test = GlobalVariablesManager.getInstance().getString("Q00616_respawn"); - final long remain = (!test.isEmpty()) ? (Long.parseLong(test) - System.currentTimeMillis()) : 0; + final long test = GlobalVariablesManager.getInstance().getLong("Q00616_respawn", 0); + final long remain = test != 0 ? test - System.currentTimeMillis() : 0; if (remain > 0) { startQuestTimer("spawn_npc", remain, null, null); diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java b/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java index 92dd260901..cc9a31b203 100644 --- a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java +++ b/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java @@ -228,8 +228,8 @@ public final class SeedOfAnnihilation extends AbstractNpcAI }); int buffsNow = 0; - final String var = GlobalVariablesManager.getInstance().getString("SeedNextStatusChange"); - if (var.equalsIgnoreCase("") || (Long.parseLong(var) < System.currentTimeMillis())) + final Long var = GlobalVariablesManager.getInstance().getLong("SeedNextStatusChange", 0); + if (var < System.currentTimeMillis()) { buffsNow = getRandom(ZONE_BUFFS_LIST.length); GlobalVariablesManager.getInstance().set("SeedBuffsList", String.valueOf(buffsNow)); @@ -238,8 +238,8 @@ public final class SeedOfAnnihilation extends AbstractNpcAI } else { - _seedsNextStatusChange = Long.parseLong(var); - buffsNow = Integer.parseInt(GlobalVariablesManager.getInstance().getString("SeedBuffsList")); + _seedsNextStatusChange = var; + buffsNow = GlobalVariablesManager.getInstance().getInt("SeedBuffsList", 0); } for (int i = 0; i < _regionsData.length; i++) { diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Core/Core.java index 514373848c..bc73947590 100644 --- a/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Core/Core.java +++ b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Core/Core.java @@ -83,8 +83,8 @@ public final class Core extends AbstractNpcAI } else { - final String test = GlobalVariablesManager.getInstance().getString("Core_Attacked"); - if (test.equalsIgnoreCase("true")) + final boolean test = GlobalVariablesManager.getInstance().getBoolean("Core_Attacked", false); + if (test) { _firstAttacked = true; } @@ -103,7 +103,7 @@ public final class Core extends AbstractNpcAI @Override public void onSave() { - GlobalVariablesManager.getInstance().set("Core_Attacked", Boolean.toString(_firstAttacked)); + GlobalVariablesManager.getInstance().set("Core_Attacked", _firstAttacked); } public void spawnBoss(L2GrandBossInstance npc) diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java index 0728cea727..b805b6bbc6 100644 --- a/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java +++ b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java @@ -82,8 +82,8 @@ public final class QueenShyeed extends AbstractNpcAI private void spawnShyeed() { - final String respawn = GlobalVariablesManager.getInstance().getString("QueenShyeedRespawn"); - final long remain = (!respawn.isEmpty()) ? Long.parseLong(respawn) - System.currentTimeMillis() : 0; + final long respawn = GlobalVariablesManager.getInstance().getLong("QueenShyeedRespawn", 0); + final long remain = respawn != 0 ? respawn - System.currentTimeMillis() : 0; if (remain > 0) { startQuestTimer("respawn", remain, null, null);