BETA: NPE Fix (ticket #5474) thans MorteX for reporting

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2PetInstance.java

@@ -875,10 +875,14 @@ public class L2PetInstance extends L2Summon
 	public final void stopSkillEffects(int skillId)
 	{
 		super.stopSkillEffects(skillId);
-		for (SummonEffect effect : SummonEffectsTable.getInstance().getPetEffects().get(getControlObjectId()))
+		List<SummonEffect> effects = SummonEffectsTable.getInstance().getPetEffects().get(getControlObjectId());
+		if (effects != null && !effects.isEmpty())
 		{
-			if (effect.getSkill().getId() == skillId)
-				SummonEffectsTable.getInstance().getPetEffects().get(getControlObjectId()).remove(effect);
+			for (SummonEffect effect : effects)
+			{
+				if (effect.getSkill().getId() == skillId)
+					SummonEffectsTable.getInstance().getPetEffects().get(getControlObjectId()).remove(effect);
+			}
 		}
 	}
 	

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2SummonInstance.java

@@ -258,10 +258,14 @@ public class L2SummonInstance extends L2Summon
 	public final void stopSkillEffects(int skillId)
 	{
 		super.stopSkillEffects(skillId);
-		for (SummonEffect effect : SummonEffectsTable.getInstance().getServitorEffects(getOwner()).get(getReferenceSkill()))
+		List<SummonEffect> effects = SummonEffectsTable.getInstance().getServitorEffects(getOwner()).get(getReferenceSkill());
+		if (effects != null && !effects.isEmpty())
 		{
-			if (effect.getSkill().getId() == skillId)
-				SummonEffectsTable.getInstance().getServitorEffects(getOwner()).get(getReferenceSkill()).remove(effect);
+			for (SummonEffect effect : effects)
+			{
+				if (effect.getSkill().getId() == skillId)
+					SummonEffectsTable.getInstance().getServitorEffects(getOwner()).get(getReferenceSkill()).remove(effect);
+			}
 		}
 	}