From 66697f4ce6ed2e44f1e234776c386569c9c447b6 Mon Sep 17 00:00:00 2001
From: Rumen Nikiforov <unafraid89@gmail.com>
Date: Sat, 3 Nov 2012 16:55:24 +0000
Subject: [PATCH] BETA: Fixing little NPE after [9274]
---
.../scripts/handlers/effecthandlers/ServitorShare.java | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java
index 640830ec5e..3676671e5b 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java
@@ -46,12 +46,18 @@ public class ServitorShare extends L2Effect
if (getEffected().isPlayer())
{
L2Summon summon = getEffector().getPet();
- effects = summon.getAllEffects();
+ if (summon != null)
+ {
+ effects = summon.getAllEffects();
+ }
}
else if (getEffected().isSummon())
{
L2PcInstance owner = getEffected().getActingPlayer();
- effects = owner.getAllEffects();
+ if (owner != null)
+ {
+ effects = owner.getAllEffects();
+ }
}
if (effects != null)
--
GitLab