From e315c54eb46b59406dd56480ec54770a20efc180 Mon Sep 17 00:00:00 2001
From: Zoey76 <zoey_76@msn.com>
Date: Mon, 8 Apr 2013 17:32:47 +0000
Subject: [PATCH] BETA: Datapack cleanup: * Using getRandom(int) and
getRandomBoolean() where is possible. * Please use it in new
scripts. * Removing invalid null check in EffectMasterHandler. *
Added missing null check in Q00350_EnhanceYourWeapon. * Fixed bug in Magical
Power of Water - Part 2 (610), multiplier shouldn't be casted to int/long!
* Fixed bug in Magical Power of Fire - Part 2 (616), multiplier shouldn't be
casted to int/long! * Removing invalid null check in MasterHandler.
---
.../scripts/ai/group_template/FairyTrees.java | 3 +--
.../ai/individual/FrightenedRagnaOrc.java | 11 +++++-----
.../data/scripts/ai/individual/Knoriks.java | 5 ++---
.../ai/individual/NecromancerValley.java | 5 ++---
.../data/scripts/ai/individual/QueenAnt.java | 3 +--
.../FortressOfResistance.java | 20 ++++++++++++++-----
.../scripts/handlers/EffectMasterHandler.java | 2 +-
.../data/scripts/handlers/MasterHandler.java | 2 +-
.../Q00034_InSearchOfCloth.java | 3 +--
.../Q00035_FindGlitteringJewelry.java | 3 +--
.../Q00036_MakeASewingKit.java | 3 +--
.../Q00193_SevenSignsDyingMessage.java | 5 ++---
.../Q00198_SevenSignsEmbryo.java | 5 ++---
.../Q00350_EnhanceYourWeapon.java | 2 +-
.../Q00431_WeddingMarch.java | 3 +--
.../Q00432_BirthdayPartySong.java | 3 +--
.../Q00453_NotStrongEnoughAlone.java | 3 +--
.../Q00610_MagicalPowerOfWaterPart2.java | 7 +++----
.../Q00616_MagicalPowerOfFirePart2.java | 7 +++----
.../TerritoryWarSuperClass.java | 7 ++-----
20 files changed, 47 insertions(+), 55 deletions(-)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/FairyTrees.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/FairyTrees.java
index a2f458ec4d..f3905518fb 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/FairyTrees.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/FairyTrees.java
@@ -28,7 +28,6 @@ import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.skills.L2Skill;
import com.l2jserver.gameserver.util.Util;
-import com.l2jserver.util.Rnd;
/**
* Fairy Trees AI.
@@ -63,7 +62,7 @@ public class FairyTrees extends AbstractNpcAI
newNpc.setRunning();
newNpc.addDamageHate(originalKiller, 0, 999);
newNpc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, originalKiller);
- if (Rnd.nextBoolean())
+ if (getRandomBoolean())
{
L2Skill skill = SkillTable.getInstance().getInfo(4243, 1);
if ((skill != null) && (originalKiller != null))
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/FrightenedRagnaOrc.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/FrightenedRagnaOrc.java
index 8a58fb9f12..f4dca5c7ab 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/FrightenedRagnaOrc.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/FrightenedRagnaOrc.java
@@ -29,7 +29,6 @@ import com.l2jserver.gameserver.model.holders.SkillHolder;
import com.l2jserver.gameserver.model.itemcontainer.PcInventory;
import com.l2jserver.gameserver.network.NpcStringId;
import com.l2jserver.gameserver.network.clientpackets.Say2;
-import com.l2jserver.util.Rnd;
/**
* Frightened Ragna Orc AI.
@@ -74,7 +73,7 @@ public final class FrightenedRagnaOrc extends AbstractNpcAI
@Override
public String onKill(L2Npc npc, L2PcInstance player, boolean isSummon)
{
- final NpcStringId msg = (Rnd.nextBoolean()) ? NpcStringId.UGH_A_CURSE_UPON_YOU : NpcStringId.I_REALLY_DIDNT_WANT_TO_FIGHT;
+ final NpcStringId msg = getRandomBoolean() ? NpcStringId.UGH_A_CURSE_UPON_YOU : NpcStringId.I_REALLY_DIDNT_WANT_TO_FIGHT;
broadcastNpcSay(npc, Say2.NPC_ALL, msg);
cancelQuestTimer("say", npc, null);
cancelQuestTimer("reward", npc, player);
@@ -93,7 +92,7 @@ public final class FrightenedRagnaOrc extends AbstractNpcAI
cancelQuestTimer("say", npc, null);
return null;
}
- final NpcStringId msg = (Rnd.nextBoolean()) ? NpcStringId.I_DONT_WANT_TO_FIGHT : NpcStringId.IS_THIS_REALLY_NECESSARY;
+ final NpcStringId msg = getRandomBoolean() ? NpcStringId.I_DONT_WANT_TO_FIGHT : NpcStringId.IS_THIS_REALLY_NECESSARY;
broadcastNpcSay(npc, Say2.NPC_ALL, msg);
break;
}
@@ -103,7 +102,7 @@ public final class FrightenedRagnaOrc extends AbstractNpcAI
{
if (getRandom(100000) < CHANCE2)
{
- final NpcStringId msg = (Rnd.nextBoolean()) ? NpcStringId.TH_THANKS_I_COULD_HAVE_BECOME_GOOD_FRIENDS_WITH_YOU : NpcStringId.ILL_GIVE_YOU_10000000_ADENA_LIKE_I_PROMISED_I_MIGHT_BE_AN_ORC_WHO_KEEPS_MY_PROMISES;
+ final NpcStringId msg = getRandomBoolean() ? NpcStringId.TH_THANKS_I_COULD_HAVE_BECOME_GOOD_FRIENDS_WITH_YOU : NpcStringId.ILL_GIVE_YOU_10000000_ADENA_LIKE_I_PROMISED_I_MIGHT_BE_AN_ORC_WHO_KEEPS_MY_PROMISES;
broadcastNpcSay(npc, Say2.NPC_ALL, msg);
npc.setScriptValue(3);
npc.doCast(SKILL.getSkill());
@@ -114,7 +113,7 @@ public final class FrightenedRagnaOrc extends AbstractNpcAI
}
else if (getRandom(100000) < CHANCE)
{
- final NpcStringId msg = (Rnd.nextBoolean()) ? NpcStringId.TH_THANKS_I_COULD_HAVE_BECOME_GOOD_FRIENDS_WITH_YOU : NpcStringId.SORRY_BUT_THIS_IS_ALL_I_HAVE_GIVE_ME_A_BREAK;
+ final NpcStringId msg = getRandomBoolean() ? NpcStringId.TH_THANKS_I_COULD_HAVE_BECOME_GOOD_FRIENDS_WITH_YOU : NpcStringId.SORRY_BUT_THIS_IS_ALL_I_HAVE_GIVE_ME_A_BREAK;
broadcastNpcSay(npc, Say2.NPC_ALL, msg);
npc.setScriptValue(3);
npc.doCast(SKILL.getSkill());
@@ -125,7 +124,7 @@ public final class FrightenedRagnaOrc extends AbstractNpcAI
}
else
{
- final NpcStringId msg = (Rnd.nextBoolean()) ? NpcStringId.THANKS_BUT_THAT_THING_ABOUT_10000000_ADENA_WAS_A_LIE_SEE_YA : NpcStringId.YOURE_PRETTY_DUMB_TO_BELIEVE_ME;
+ final NpcStringId msg = getRandomBoolean() ? NpcStringId.THANKS_BUT_THAT_THING_ABOUT_10000000_ADENA_WAS_A_LIE_SEE_YA : NpcStringId.YOURE_PRETTY_DUMB_TO_BELIEVE_ME;
broadcastNpcSay(npc, Say2.NPC_ALL, msg);
}
startQuestTimer("despawn", 1000, npc, null);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Knoriks.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Knoriks.java
index ef3ae7fefc..728cd0603d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Knoriks.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Knoriks.java
@@ -25,7 +25,6 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.NpcStringId;
import com.l2jserver.gameserver.network.clientpackets.Say2;
import com.l2jserver.gameserver.network.serverpackets.NpcSay;
-import com.l2jserver.util.Rnd;
/**
* Knoriks AI.
@@ -44,9 +43,9 @@ public class Knoriks extends AbstractNpcAI
@Override
public String onAggroRangeEnter(L2Npc npc, L2PcInstance player, boolean isSummon)
{
- if ((npc.isScriptValue(0)) && (Rnd.get(100) < 60))
+ if ((npc.isScriptValue(0)) && (getRandom(100) < 60))
{
- if (Rnd.get(100) < 50)
+ if (getRandom(100) < 50)
{
npc.setScriptValue(1);
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/NecromancerValley.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/NecromancerValley.java
index 6bf2e5f8bb..a4c65c65c6 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/NecromancerValley.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/NecromancerValley.java
@@ -25,7 +25,6 @@ import com.l2jserver.gameserver.model.actor.L2Attackable;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.util.Rnd;
/**
* Necromancer of the Valley AI.
@@ -47,7 +46,7 @@ public class NecromancerValley extends AbstractNpcAI
@Override
public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon)
{
- if (Rnd.get(100) < 20)
+ if (getRandom(100) < 20)
{
L2Character attacker = isSummon ? killer.getSummon() : killer;
L2Attackable Orc = (L2Attackable) addSpawn(EXPLODING_ORC_GHOST, npc.getX(), npc.getY(), npc.getZ() + 10, npc.getHeading(), false, 0, true);
@@ -67,7 +66,7 @@ public class NecromancerValley extends AbstractNpcAI
@Override
public String onAttack(L2Npc npc, L2PcInstance attacker, int damage, boolean isSummon)
{
- if (Rnd.get(100) < 1)
+ if (getRandom(100) < 1)
{
L2Character player = isSummon ? attacker.getSummon() : attacker;
L2Attackable Orc = (L2Attackable) addSpawn(EXPLODING_ORC_GHOST, npc.getX(), npc.getY(), npc.getZ() + 10, npc.getHeading(), false, 0, true);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/QueenAnt.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/QueenAnt.java
index 4a8189df74..6fa8b51cf5 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/QueenAnt.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/QueenAnt.java
@@ -39,7 +39,6 @@ import com.l2jserver.gameserver.model.skills.L2Skill;
import com.l2jserver.gameserver.model.zone.type.L2BossZone;
import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse;
import com.l2jserver.gameserver.network.serverpackets.PlaySound;
-import com.l2jserver.util.Rnd;
/**
* Queen Ant's AI
@@ -172,7 +171,7 @@ public class QueenAnt extends AbstractNpcAI
if ((nurse.getTarget() != _larva) || notCasting)
{
nurse.setTarget(_larva);
- nurse.useMagic(Rnd.nextBoolean() ? HEAL1.getSkill() : HEAL2.getSkill());
+ nurse.useMagic(getRandomBoolean() ? HEAL1.getSkill() : HEAL2.getSkill());
}
continue;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/FortressOfResistance/FortressOfResistance.java b/L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/FortressOfResistance/FortressOfResistance.java
index 97fc381378..ace7f1f44a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/FortressOfResistance/FortressOfResistance.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/FortressOfResistance/FortressOfResistance.java
@@ -76,11 +76,21 @@ public final class FortressOfResistance extends ClanHallSiegeEngine
_nurka = new L2Spawn(NpcTable.getInstance().getTemplate(BLOODY_LORD_NURKA));
_nurka.setAmount(1);
_nurka.setRespawnDelay(10800);
-
- /*
- * int chance = Rnd.get(100) + 1; if(chance <= 30) coords = NURKA_COORDS[0]; else if(chance > 30 && chance <= 70) coords = NURKA_COORDS[1]; else coords = NURKA_COORDS[2];
- */
-
+// @formatter:off
+// int chance = getRandom(100) + 1;
+// if (chance <= 30)
+// {
+// coords = NURKA_COORDS[0];
+// }
+// else if ((chance > 30) && (chance <= 70))
+// {
+// coords = NURKA_COORDS[1];
+// }
+// else
+// {
+// coords = NURKA_COORDS[2];
+// }
+// @formatter:on
_nurka.setLocation(NURKA_COORDS[0]);
}
catch (Exception e)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/EffectMasterHandler.java
index 763995dbcb..abfcb66ebc 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/EffectMasterHandler.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/EffectMasterHandler.java
@@ -258,7 +258,7 @@ public final class EffectMasterHandler
}
catch (Exception e)
{
- _log.log(Level.WARNING, "Failed loading effect handler" + ((c == null) ? "!" : ":" + c.getSimpleName()), e);
+ _log.log(Level.WARNING, "Failed loading effect handler: " + c.getSimpleName(), e);
continue;
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/MasterHandler.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/MasterHandler.java
index 2fd97c7b84..d5615d0a5d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/MasterHandler.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/MasterHandler.java
@@ -682,7 +682,7 @@ public class MasterHandler
}
catch (Exception e)
{
- _log.log(Level.WARNING, "Failed loading handler" + ((c == null) ? "!" : ":" + c.getSimpleName()), e);
+ _log.log(Level.WARNING, "Failed loading handler: " + c.getSimpleName(), e);
continue;
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java
index 5239d751d2..785d0fed96 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java
@@ -23,7 +23,6 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
-import com.l2jserver.util.Rnd;
/**
* In Search of Cloth (34)
@@ -120,7 +119,7 @@ public class Q00034_InSearchOfCloth extends Quest
public String onKill(L2Npc npc, L2PcInstance player, boolean isSummon)
{
final L2PcInstance member = getRandomPartyMember(player, 4);
- if ((member != null) && Rnd.nextBoolean())
+ if ((member != null) && getRandomBoolean())
{
final QuestState st = member.getQuestState(getName());
st.giveItems(SPINNERET, 1);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java
index a7599c69f1..52666dbf67 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java
@@ -23,7 +23,6 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
-import com.l2jserver.util.Rnd;
/**
* Find Glittering Jewelry (35)
@@ -112,7 +111,7 @@ public class Q00035_FindGlitteringJewelry extends Quest
if (member != null)
{
final QuestState st = member.getQuestState(getName());
- if (Rnd.nextBoolean())
+ if (getRandomBoolean())
{
st.giveItems(ROUGH_JEWEL, 1);
if (st.getQuestItemsCount(ROUGH_JEWEL) >= JEWEL_COUNT)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java
index f1e7d475ff..5f8dbd18e3 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java
@@ -23,7 +23,6 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
-import com.l2jserver.util.Rnd;
/**
* Make a Sewing Kit (36)
@@ -104,7 +103,7 @@ public class Q00036_MakeASewingKit extends Quest
if (member != null)
{
final QuestState st = member.getQuestState(getName());
- if (Rnd.nextBoolean())
+ if (getRandomBoolean())
{
st.giveItems(ENCHANTED_IRON, 1);
if (st.getQuestItemsCount(ENCHANTED_IRON) >= IRON_COUNT)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/Q00193_SevenSignsDyingMessage.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/Q00193_SevenSignsDyingMessage.java
index 3f5c657fd2..8b3a087a53 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/Q00193_SevenSignsDyingMessage.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/Q00193_SevenSignsDyingMessage.java
@@ -31,7 +31,6 @@ import com.l2jserver.gameserver.model.quest.State;
import com.l2jserver.gameserver.network.NpcStringId;
import com.l2jserver.gameserver.network.clientpackets.Say2;
import com.l2jserver.gameserver.network.serverpackets.NpcSay;
-import com.l2jserver.util.Rnd;
/**
* Seven Signs, Dying Message (193)
@@ -163,7 +162,7 @@ public class Q00193_SevenSignsDyingMessage extends Quest
NpcSay ns = new NpcSay(npc.getObjectId(), Say2.NPC_ALL, npc.getNpcId(), NpcStringId.S1_THAT_STRANGER_MUST_BE_DEFEATED_HERE_IS_THE_ULTIMATE_HELP);
ns.addStringParameter(player.getName());
npc.broadcastPacket(ns);
- startQuestTimer("heal", 30000 - Rnd.get(20000), npc, player);
+ startQuestTimer("heal", 30000 - getRandom(20000), npc, player);
L2MonsterInstance monster = (L2MonsterInstance) addSpawn(SHILENS_EVIL_THOUGHTS, 82425, 47232, -3216, 0, false, 0, false);
monster.broadcastPacket(new NpcSay(monster.getObjectId(), Say2.NPC_ALL, monster.getNpcId(), NpcStringId.YOU_ARE_NOT_THE_OWNER_OF_THAT_ITEM));
monster.setRunning();
@@ -186,7 +185,7 @@ public class Q00193_SevenSignsDyingMessage extends Quest
npc.setTarget(player);
npc.doCast(NPC_HEAL.getSkill());
}
- startQuestTimer("heal", 30000 - Rnd.get(20000), npc, player);
+ startQuestTimer("heal", 30000 - getRandom(20000), npc, player);
break;
}
case "30760-02.html":
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java
index ec785b3972..ca47925a17 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java
@@ -32,7 +32,6 @@ import com.l2jserver.gameserver.model.quest.State;
import com.l2jserver.gameserver.network.NpcStringId;
import com.l2jserver.gameserver.network.clientpackets.Say2;
import com.l2jserver.gameserver.network.serverpackets.NpcSay;
-import com.l2jserver.util.Rnd;
/**
* Seven Signs, Embryo (198)
@@ -112,7 +111,7 @@ public class Q00198_SevenSignsEmbryo extends Quest
NpcSay ns = new NpcSay(npc.getObjectId(), Say2.NPC_ALL, npc.getNpcId(), NpcStringId.S1_THAT_STRANGER_MUST_BE_DEFEATED_HERE_IS_THE_ULTIMATE_HELP);
ns.addStringParameter(player.getName());
npc.broadcastPacket(ns);
- startQuestTimer("heal", 30000 - Rnd.get(20000), npc, player);
+ startQuestTimer("heal", 30000 - getRandom(20000), npc, player);
L2MonsterInstance monster = (L2MonsterInstance) addSpawn(SHILENS_EVIL_THOUGHTS, -23734, -9184, -5384, 0, false, 0, false, npc.getInstanceId());
monster.broadcastPacket(new NpcSay(monster.getObjectId(), Say2.NPC_ALL, monster.getNpcId(), NpcStringId.YOU_ARE_NOT_THE_OWNER_OF_THAT_ITEM));
monster.setRunning();
@@ -135,7 +134,7 @@ public class Q00198_SevenSignsEmbryo extends Quest
npc.setTarget(player);
npc.doCast(NPC_HEAL.getSkill());
}
- startQuestTimer("heal", 30000 - Rnd.get(20000), npc, player);
+ startQuestTimer("heal", 30000 - getRandom(20000), npc, player);
break;
}
case "32597-08.html":
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java
index 0aed07c895..d82415657b 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java
@@ -621,7 +621,7 @@ public class Q00350_EnhanceYourWeapon extends Quest
temp.put(i, info);
}
}
- else
+ else if (att2 != null)
{
StringTokenizer st = new StringTokenizer(att2.getNodeValue(), ",");
int tokenCount = st.countTokens();
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00431_WeddingMarch/Q00431_WeddingMarch.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00431_WeddingMarch/Q00431_WeddingMarch.java
index 80be60c522..c8350422cd 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00431_WeddingMarch/Q00431_WeddingMarch.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00431_WeddingMarch/Q00431_WeddingMarch.java
@@ -23,7 +23,6 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
-import com.l2jserver.util.Rnd;
/**
* Wedding March (431)<br>
@@ -91,7 +90,7 @@ public class Q00431_WeddingMarch extends Quest
if (member != null)
{
final QuestState st = member.getQuestState(getName());
- if (Rnd.nextBoolean())
+ if (getRandomBoolean())
{
st.giveItems(SILVER_CRYSTAL, 1);
if (st.getQuestItemsCount(SILVER_CRYSTAL) >= CRYSTAL_COUNT)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00432_BirthdayPartySong/Q00432_BirthdayPartySong.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00432_BirthdayPartySong/Q00432_BirthdayPartySong.java
index 7a171d02f1..4a2515dcbc 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00432_BirthdayPartySong/Q00432_BirthdayPartySong.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00432_BirthdayPartySong/Q00432_BirthdayPartySong.java
@@ -23,7 +23,6 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
-import com.l2jserver.util.Rnd;
/**
* Birthday Party Song (432)<br>
@@ -87,7 +86,7 @@ public class Q00432_BirthdayPartySong extends Quest
{
final QuestState st = player.getQuestState(getName());
- if ((st != null) && st.isCond(1) && (Rnd.nextBoolean()))
+ if ((st != null) && st.isCond(1) && getRandomBoolean())
{
st.giveItems(RED_CRYSTAL, 1);
if (st.getQuestItemsCount(RED_CRYSTAL) == 50)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java
index 54fb901dd5..fe40f63d35 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java
@@ -28,7 +28,6 @@ import com.l2jserver.gameserver.model.quest.QuestState.QuestType;
import com.l2jserver.gameserver.model.quest.State;
import com.l2jserver.gameserver.network.serverpackets.ExQuestNpcLogList;
import com.l2jserver.gameserver.util.Util;
-import com.l2jserver.util.Rnd;
/**
* Not Strong Enough Alone (453)
@@ -312,7 +311,7 @@ public class Q00453_NotStrongEnoughAlone extends Quest
}
case 5:
{
- st.giveItems(REWARD[Rnd.get(REWARD.length)][getRandom(REWARD[0].length)], 1);
+ st.giveItems(REWARD[getRandom(REWARD.length)][getRandom(REWARD[0].length)], 1);
st.exitQuest(QuestType.DAILY, true);
htmltext = "32734-14.html";
break;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00610_MagicalPowerOfWaterPart2/Q00610_MagicalPowerOfWaterPart2.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00610_MagicalPowerOfWaterPart2/Q00610_MagicalPowerOfWaterPart2.java
index 0e60e7da6a..d651a10a15 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00610_MagicalPowerOfWaterPart2/Q00610_MagicalPowerOfWaterPart2.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00610_MagicalPowerOfWaterPart2/Q00610_MagicalPowerOfWaterPart2.java
@@ -28,7 +28,6 @@ import com.l2jserver.gameserver.network.NpcStringId;
import com.l2jserver.gameserver.network.clientpackets.Say2;
import com.l2jserver.gameserver.network.serverpackets.NpcSay;
import com.l2jserver.gameserver.util.Util;
-import com.l2jserver.util.Rnd;
/**
* Magical Power of Water - Part 2 (610)
@@ -145,9 +144,9 @@ public class Q00610_MagicalPowerOfWaterPart2 extends Quest
@Override
public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon)
{
- final long respawnMinDelay = 43200000l * (long) Config.RAID_MIN_RESPAWN_MULTIPLIER;
- final long respawnMaxDelay = 129600000l * (long) Config.RAID_MAX_RESPAWN_MULTIPLIER;
- final long respawnDelay = Rnd.get(respawnMinDelay, respawnMaxDelay);
+ final int respawnMinDelay = (int) (43200000 * Config.RAID_MIN_RESPAWN_MULTIPLIER);
+ final int respawnMaxDelay = (int) (129600000 * Config.RAID_MAX_RESPAWN_MULTIPLIER);
+ final int respawnDelay = getRandom(respawnMinDelay, respawnMaxDelay);
cancelQuestTimer("despawn_ashutar", npc, null);
saveGlobalQuestVar("Q00610_respawn", String.valueOf(System.currentTimeMillis() + respawnDelay));
startQuestTimer("spawn_npc", respawnDelay, null, null);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00616_MagicalPowerOfFirePart2/Q00616_MagicalPowerOfFirePart2.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00616_MagicalPowerOfFirePart2/Q00616_MagicalPowerOfFirePart2.java
index de2127f8f1..f680ce8b30 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00616_MagicalPowerOfFirePart2/Q00616_MagicalPowerOfFirePart2.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00616_MagicalPowerOfFirePart2/Q00616_MagicalPowerOfFirePart2.java
@@ -28,7 +28,6 @@ import com.l2jserver.gameserver.network.NpcStringId;
import com.l2jserver.gameserver.network.clientpackets.Say2;
import com.l2jserver.gameserver.network.serverpackets.NpcSay;
import com.l2jserver.gameserver.util.Util;
-import com.l2jserver.util.Rnd;
/**
* Magical Power of Fire - Part 2 (616)
@@ -145,9 +144,9 @@ public class Q00616_MagicalPowerOfFirePart2 extends Quest
@Override
public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon)
{
- final long respawnMinDelay = 43200000l * (long) Config.RAID_MIN_RESPAWN_MULTIPLIER;
- final long respawnMaxDelay = 129600000l * (long) Config.RAID_MAX_RESPAWN_MULTIPLIER;
- final long respawnDelay = Rnd.get(respawnMinDelay, respawnMaxDelay);
+ final int respawnMinDelay = (int) (43200000 * Config.RAID_MIN_RESPAWN_MULTIPLIER);
+ final int respawnMaxDelay = (int) (129600000 * Config.RAID_MAX_RESPAWN_MULTIPLIER);
+ final int respawnDelay = getRandom(respawnMinDelay, respawnMaxDelay);
cancelQuestTimer("despawn_nastron", npc, null);
saveGlobalQuestVar("Q00616_respawn", String.valueOf(System.currentTimeMillis() + respawnDelay));
startQuestTimer("spawn_npc", respawnDelay, null, null);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/TerritoryWarSuperClass.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/TerritoryWarSuperClass.java
index 873beacfce..18d23892f1 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/TerritoryWarSuperClass.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/TerritoryWarSuperClass.java
@@ -440,11 +440,8 @@ public class TerritoryWarSuperClass extends Quest
{
continue;
}
- QuestState st = player.getQuestState(territoryQuest.getName());
- if (st == null)
- {
- st = territoryQuest.newQuestState(player);
- }
+
+ QuestState st = player.hasQuestState(territoryQuest.getName()) ? player.getQuestState(territoryQuest.getName()) : territoryQuest.newQuestState(player);
if (val)
{
st.setState(State.STARTED, false);
--
GitLab