From efba77b228170b9d68d1a8f4534700404abd8c9a Mon Sep 17 00:00:00 2001
From: Zoey76 <zoey_76@msn.com>
Date: Tue, 12 Aug 2014 22:56:03 +0000
Subject: [PATCH] BETA: Typo fixes for [10404]: * Missing bypass update.
* Reported by: valanths1990 * Patch by: valanths1990
* Missing index validation. * Reported by: UnAfraid
---
.../data/html/olympiad/olympiad_5buffs.htm | 20 +++++++++----------
.../bypasshandlers/OlympiadManagerLink.java | 9 ++++++++-
2 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/L2J_DataPack_BETA/dist/game/data/html/olympiad/olympiad_5buffs.htm b/L2J_DataPack_BETA/dist/game/data/html/olympiad/olympiad_5buffs.htm
index c09f9ad17b..b256304083 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/olympiad/olympiad_5buffs.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/olympiad/olympiad_5buffs.htm
@@ -5,16 +5,16 @@
<tr><td height=24></td></tr>
<tr><td><center>
<br><center>
-<a action="bypass -h npc_%objectId%_OlyBuff 4357">Haste Lv2</a><br>
-<a action="bypass -h npc_%objectId%_OlyBuff 4342">Wind Walk Lv2</a><br>
-<a action="bypass -h npc_%objectId%_OlyBuff 4356">Empower Lv3</a><br>
-<a action="bypass -h npc_%objectId%_OlyBuff 4355">Acumen Lv3</a><br>
-<a action="bypass -h npc_%objectId%_OlyBuff 4351">Concentration Lv6</a><br>
-<a action="bypass -h npc_%objectId%_OlyBuff 4345">Might Lv3</a><br>
-<a action="bypass -h npc_%objectId%_OlyBuff 4358">Guidance Lv3</a><br>
-<a action="bypass -h npc_%objectId%_OlyBuff 4359">Focus Lv3</a><br>
-<a action="bypass -h npc_%objectId%_OlyBuff 4360">Death Whisper Lv3</a><br>
-<a action="bypass -h npc_%objectId%_OlyBuff 4352">Berserker Spirit Lv2</a>
+<a action="bypass -h npc_%objectId%_OlyBuff 0">Haste Lv2</a><br>
+<a action="bypass -h npc_%objectId%_OlyBuff 1">Wind Walk Lv2</a><br>
+<a action="bypass -h npc_%objectId%_OlyBuff 2">Empower Lv3</a><br>
+<a action="bypass -h npc_%objectId%_OlyBuff 3">Acumen Lv3</a><br>
+<a action="bypass -h npc_%objectId%_OlyBuff 4">Concentration Lv6</a><br>
+<a action="bypass -h npc_%objectId%_OlyBuff 5">Might Lv3</a><br>
+<a action="bypass -h npc_%objectId%_OlyBuff 6">Guidance Lv3</a><br>
+<a action="bypass -h npc_%objectId%_OlyBuff 7">Focus Lv3</a><br>
+<a action="bypass -h npc_%objectId%_OlyBuff 8">Death Whisper Lv3</a><br>
+<a action="bypass -h npc_%objectId%_OlyBuff 9">Berserker Spirit Lv2</a>
</center></td></tr>
<tr><td height=24></td></tr>
</table>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/OlympiadManagerLink.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/OlympiadManagerLink.java
index b3b72c46d5..8ccb3919f4 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/OlympiadManagerLink.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/OlympiadManagerLink.java
@@ -257,7 +257,14 @@ public class OlympiadManagerLink implements IBypassHandler
return false;
}
- final NpcBufferData npcBuffGroupInfo = NpcBufferTable.getInstance().getSkillInfo(target.getId(), BUFFS[Integer.parseInt(params[1])]);
+ final int index = Integer.parseInt(params[1]);
+ if ((index < 0) || (index > BUFFS.length))
+ {
+ _log.warning("Olympiad Buffer Warning: npcId = " + target.getId() + " has invalid index sent in the bypass: " + index);
+ return false;
+ }
+
+ final NpcBufferData npcBuffGroupInfo = NpcBufferTable.getInstance().getSkillInfo(target.getId(), BUFFS[index]);
if (npcBuffGroupInfo == null)
{
_log.warning("Olympiad Buffer Warning: npcId = " + target.getId() + " Location: " + target.getX() + ", " + target.getY() + ", " + target.getZ() + " Player: " + activeChar.getName() + " has tried to use skill group (" + params[1] + ") not assigned to the NPC Buffer!");
--
GitLab