From fc14262cf3459b2c71619b66831dd7888e05b326 Mon Sep 17 00:00:00 2001
From: Rumen Nikiforov <unafraid89@gmail.com>
Date: Tue, 25 Sep 2012 19:36:42 +0000
Subject: [PATCH] BETA: Fixing NPE in L2AttackableAIScript. * Also minor
cleanup in Craft handler. * Reported by: St3eT * Tested by: St3eT
---
.../scripts/ai/group_template/L2AttackableAIScript.java | 9 +++------
.../game/data/scripts/handlers/skillhandlers/Craft.java | 2 +-
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/L2AttackableAIScript.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/L2AttackableAIScript.java
index 27e2e96935..2a2cb3f5b2 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/L2AttackableAIScript.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/L2AttackableAIScript.java
@@ -175,13 +175,10 @@ public final class L2AttackableAIScript extends QuestJython
if (npc instanceof L2MonsterInstance)
{
final L2MonsterInstance mob = (L2MonsterInstance) npc;
- if (mob.getLeader() != null)
+ if (mob.getLeader() != null && mob.getLeader().hasMinions())
{
- final int respawnTime = Config.MINIONS_RESPAWN_TIME.containsKey(npc.getNpcId()) ? Config.MINIONS_RESPAWN_TIME.get(mob.getNpcId()) * 1000 : -1;
- if (mob.hasMinions())
- {
- mob.getLeader().getMinionList().onMinionDie(mob, respawnTime);
- }
+ final int respawnTime = Config.MINIONS_RESPAWN_TIME.containsKey(npc.getNpcId()) ? Config.MINIONS_RESPAWN_TIME.get(mob.getNpcId()) * 1000 : -1;
+ mob.getLeader().getMinionList().onMinionDie(mob, respawnTime);
}
if (mob.hasMinions())
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Craft.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Craft.java
index e755f5de76..e447de5a23 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Craft.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Craft.java
@@ -47,7 +47,7 @@ public class Craft implements ISkillHandler
player.sendPacket(SystemMessageId.CANNOT_CREATED_WHILE_ENGAGED_IN_TRADING);
return;
}
- RecipeController.getInstance().requestBookOpen(player, (skill.getSkillType() == L2SkillType.DWARVEN_CRAFT) ? true : false);
+ RecipeController.getInstance().requestBookOpen(player, (skill.getSkillType() == L2SkillType.DWARVEN_CRAFT));
}
@Override
--
GitLab