Added Feather of Blessing to common skills.

L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skill/CommonSkill.java

@@ -48,6 +48,7 @@ public enum CommonSkill
 	CREATE_COMMON(1320, 1),
 	DIVINE_INSPIRATION(1405, 1),
 	CARAVANS_SECRET_MEDICINE(2341, 1),
+	FEATHER_OF_BLESSING(7008, 1),
 	SHILENS_BREATH(14571, 1),
 	IMPRIT_OF_LIGHT(19034, 1),
 	IMPRIT_OF_DARKNESS(19035, 1),

L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java

@@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.clientpackets;
 import org.l2jmobius.commons.network.PacketReader;
 import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.data.xml.ClanHallData;
-import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.enums.TeleportWhereType;
 import org.l2jmobius.gameserver.instancemanager.CastleManager;
 import org.l2jmobius.gameserver.instancemanager.FortManager;
@@ -38,7 +37,7 @@ import org.l2jmobius.gameserver.model.siege.Castle;
 import org.l2jmobius.gameserver.model.siege.Castle.CastleFunction;
 import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.model.siege.Fort.FortFunction;
-import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.CommonSkill;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.PacketLogger;
 
@@ -253,12 +252,8 @@ public class RequestRestartPoint implements IClientIncomingPacket
 				}
 				else if (player.destroyItemByItemId("Feather", 10649, 1, player, false) || player.destroyItemByItemId("Feather", 13300, 1, player, false) || player.destroyItemByItemId("Feather", 13128, 1, player, false))
 				{
-					final Skill skill = SkillData.getInstance().getSkill(7008, 1);
+					player.doRevive(100);
-					if (skill != null)
+					CommonSkill.FEATHER_OF_BLESSING.getSkill().applyEffects(player, player);
-					{
-						player.doRevive(100);
-						skill.applyEffects(player, player);
-					}
 				}
 				else
 				{

L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/Die.java

@@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.clan.Clan;
 import org.l2jmobius.gameserver.model.siege.Castle;
 import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
-import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.CommonSkill;
 import org.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
@@ -63,10 +63,10 @@ public class Die implements IClientOutgoingPacket
 			
 			for (BuffInfo effect : creature.getEffectList().getEffects())
 			{
-				final Skill skill = effect.getSkill();
+				if (effect.getSkill().getId() == CommonSkill.FEATHER_OF_BLESSING.getId())
-				if (skill.getId() == 7008)
 				{
 					_delayFeather = effect.getTime();
+					break;
 				}
 			}
 			

L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/skill/CommonSkill.java

@@ -48,6 +48,7 @@ public enum CommonSkill
 	CREATE_COMMON(1320, 1),
 	DIVINE_INSPIRATION(1405, 1),
 	CARAVANS_SECRET_MEDICINE(2341, 1),
+	FEATHER_OF_BLESSING(7008, 1),
 	SHILENS_BREATH(14571, 1),
 	IMPRIT_OF_LIGHT(19034, 1),
 	IMPRIT_OF_DARKNESS(19035, 1),

L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java

@@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.clientpackets;
 import org.l2jmobius.commons.network.PacketReader;
 import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.data.xml.ClanHallData;
-import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.enums.TeleportWhereType;
 import org.l2jmobius.gameserver.instancemanager.CastleManager;
 import org.l2jmobius.gameserver.instancemanager.FortManager;
@@ -38,7 +37,7 @@ import org.l2jmobius.gameserver.model.siege.Castle;
 import org.l2jmobius.gameserver.model.siege.Castle.CastleFunction;
 import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.model.siege.Fort.FortFunction;
-import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.CommonSkill;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.PacketLogger;
 
@@ -253,12 +252,8 @@ public class RequestRestartPoint implements IClientIncomingPacket
 				}
 				else if (player.destroyItemByItemId("Feather", 10649, 1, player, false) || player.destroyItemByItemId("Feather", 13300, 1, player, false) || player.destroyItemByItemId("Feather", 13128, 1, player, false))
 				{
-					final Skill skill = SkillData.getInstance().getSkill(7008, 1);
+					player.doRevive(100);
-					if (skill != null)
+					CommonSkill.FEATHER_OF_BLESSING.getSkill().applyEffects(player, player);
-					{
-						player.doRevive(100);
-						skill.applyEffects(player, player);
-					}
 				}
 				else
 				{

L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/Die.java

@@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.clan.Clan;
 import org.l2jmobius.gameserver.model.siege.Castle;
 import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
-import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.CommonSkill;
 import org.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
@@ -63,10 +63,10 @@ public class Die implements IClientOutgoingPacket
 			
 			for (BuffInfo effect : creature.getEffectList().getEffects())
 			{
-				final Skill skill = effect.getSkill();
+				if (effect.getSkill().getId() == CommonSkill.FEATHER_OF_BLESSING.getId())
-				if (skill.getId() == 7008)
 				{
 					_delayFeather = effect.getTime();
+					break;
 				}
 			}
 			

L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/skill/CommonSkill.java

@@ -48,6 +48,7 @@ public enum CommonSkill
 	CREATE_COMMON(1320, 1),
 	DIVINE_INSPIRATION(1405, 1),
 	CARAVANS_SECRET_MEDICINE(2341, 1),
+	FEATHER_OF_BLESSING(7008, 1),
 	SHILENS_BREATH(14571, 1),
 	IMPRIT_OF_LIGHT(19034, 1),
 	IMPRIT_OF_DARKNESS(19035, 1),

L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java

@@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.clientpackets;
 import org.l2jmobius.commons.network.PacketReader;
 import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.data.xml.ClanHallData;
-import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.enums.TeleportWhereType;
 import org.l2jmobius.gameserver.instancemanager.CastleManager;
 import org.l2jmobius.gameserver.instancemanager.FortManager;
@@ -38,7 +37,7 @@ import org.l2jmobius.gameserver.model.siege.Castle;
 import org.l2jmobius.gameserver.model.siege.Castle.CastleFunction;
 import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.model.siege.Fort.FortFunction;
-import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.CommonSkill;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.PacketLogger;
 
@@ -253,12 +252,8 @@ public class RequestRestartPoint implements IClientIncomingPacket
 				}
 				else if (player.destroyItemByItemId("Feather", 10649, 1, player, false) || player.destroyItemByItemId("Feather", 13300, 1, player, false) || player.destroyItemByItemId("Feather", 13128, 1, player, false))
 				{
-					final Skill skill = SkillData.getInstance().getSkill(7008, 1);
+					player.doRevive(100);
-					if (skill != null)
+					CommonSkill.FEATHER_OF_BLESSING.getSkill().applyEffects(player, player);
-					{
-						player.doRevive(100);
-						skill.applyEffects(player, player);
-					}
 				}
 				else
 				{

L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/Die.java

@@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.clan.Clan;
 import org.l2jmobius.gameserver.model.siege.Castle;
 import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
-import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.CommonSkill;
 import org.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
@@ -63,10 +63,10 @@ public class Die implements IClientOutgoingPacket
 			
 			for (BuffInfo effect : creature.getEffectList().getEffects())
 			{
-				final Skill skill = effect.getSkill();
+				if (effect.getSkill().getId() == CommonSkill.FEATHER_OF_BLESSING.getId())
-				if (skill.getId() == 7008)
 				{
 					_delayFeather = effect.getTime();
+					break;
 				}
 			}
 			

L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/skill/CommonSkill.java

@@ -48,6 +48,7 @@ public enum CommonSkill
 	CREATE_COMMON(1320, 1),
 	DIVINE_INSPIRATION(1405, 1),
 	CARAVANS_SECRET_MEDICINE(2341, 1),
+	FEATHER_OF_BLESSING(7008, 1),
 	SHILENS_BREATH(14571, 1),
 	IMPRIT_OF_LIGHT(19034, 1),
 	IMPRIT_OF_DARKNESS(19035, 1),

L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java

@@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.clientpackets;
 import org.l2jmobius.commons.network.PacketReader;
 import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.data.xml.ClanHallData;
-import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.enums.TeleportWhereType;
 import org.l2jmobius.gameserver.instancemanager.CastleManager;
 import org.l2jmobius.gameserver.instancemanager.FortManager;
@@ -38,7 +37,7 @@ import org.l2jmobius.gameserver.model.siege.Castle;
 import org.l2jmobius.gameserver.model.siege.Castle.CastleFunction;
 import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.model.siege.Fort.FortFunction;
-import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.CommonSkill;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.PacketLogger;
 
@@ -253,12 +252,8 @@ public class RequestRestartPoint implements IClientIncomingPacket
 				}
 				else if (player.destroyItemByItemId("Feather", 10649, 1, player, false) || player.destroyItemByItemId("Feather", 13300, 1, player, false) || player.destroyItemByItemId("Feather", 13128, 1, player, false))
 				{
-					final Skill skill = SkillData.getInstance().getSkill(7008, 1);
+					player.doRevive(100);
-					if (skill != null)
+					CommonSkill.FEATHER_OF_BLESSING.getSkill().applyEffects(player, player);
-					{
-						player.doRevive(100);
-						skill.applyEffects(player, player);
-					}
 				}
 				else
 				{

L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/Die.java

@@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.clan.Clan;
 import org.l2jmobius.gameserver.model.siege.Castle;
 import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
-import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.CommonSkill;
 import org.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
@@ -63,10 +63,10 @@ public class Die implements IClientOutgoingPacket
 			
 			for (BuffInfo effect : creature.getEffectList().getEffects())
 			{
-				final Skill skill = effect.getSkill();
+				if (effect.getSkill().getId() == CommonSkill.FEATHER_OF_BLESSING.getId())
-				if (skill.getId() == 7008)
 				{
 					_delayFeather = effect.getTime();
+					break;
 				}
 			}
 			

L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/skill/CommonSkill.java

@@ -48,6 +48,7 @@ public enum CommonSkill
 	CREATE_COMMON(1320, 1),
 	DIVINE_INSPIRATION(1405, 1),
 	CARAVANS_SECRET_MEDICINE(2341, 1),
+	FEATHER_OF_BLESSING(7008, 1),
 	SHILENS_BREATH(14571, 1),
 	IMPRIT_OF_LIGHT(19034, 1),
 	IMPRIT_OF_DARKNESS(19035, 1),

L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java

@@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.clientpackets;
 import org.l2jmobius.commons.network.PacketReader;
 import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.data.xml.ClanHallData;
-import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.enums.TeleportWhereType;
 import org.l2jmobius.gameserver.instancemanager.CastleManager;
 import org.l2jmobius.gameserver.instancemanager.FortManager;
@@ -38,7 +37,7 @@ import org.l2jmobius.gameserver.model.siege.Castle;
 import org.l2jmobius.gameserver.model.siege.Castle.CastleFunction;
 import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.model.siege.Fort.FortFunction;
-import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.CommonSkill;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.PacketLogger;
 
@@ -253,12 +252,8 @@ public class RequestRestartPoint implements IClientIncomingPacket
 				}
 				else if (player.destroyItemByItemId("Feather", 10649, 1, player, false) || player.destroyItemByItemId("Feather", 13300, 1, player, false) || player.destroyItemByItemId("Feather", 13128, 1, player, false))
 				{
-					final Skill skill = SkillData.getInstance().getSkill(7008, 1);
+					player.doRevive(100);
-					if (skill != null)
+					CommonSkill.FEATHER_OF_BLESSING.getSkill().applyEffects(player, player);
-					{
-						player.doRevive(100);
-						skill.applyEffects(player, player);
-					}
 				}
 				else
 				{

L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/Die.java

@@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.clan.Clan;
 import org.l2jmobius.gameserver.model.siege.Castle;
 import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
-import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.CommonSkill;
 import org.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
@@ -63,10 +63,10 @@ public class Die implements IClientOutgoingPacket
 			
 			for (BuffInfo effect : creature.getEffectList().getEffects())
 			{
-				final Skill skill = effect.getSkill();
+				if (effect.getSkill().getId() == CommonSkill.FEATHER_OF_BLESSING.getId())
-				if (skill.getId() == 7008)
 				{
 					_delayFeather = effect.getTime();
+					break;
 				}
 			}
 			

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skill/CommonSkill.java

@@ -48,6 +48,7 @@ public enum CommonSkill
 	CREATE_COMMON(1320, 1),
 	DIVINE_INSPIRATION(1405, 1),
 	CARAVANS_SECRET_MEDICINE(2341, 1),
+	FEATHER_OF_BLESSING(7008, 1),
 	IMPRIT_OF_LIGHT(19034, 1),
 	IMPRIT_OF_DARKNESS(19035, 1),
 	ABILITY_OF_LIGHT(19032, 1),

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java

@@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.clientpackets;
 import org.l2jmobius.commons.network.PacketReader;
 import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.data.xml.ClanHallData;
-import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.enums.TeleportWhereType;
 import org.l2jmobius.gameserver.instancemanager.CastleManager;
 import org.l2jmobius.gameserver.instancemanager.FortManager;
@@ -38,7 +37,7 @@ import org.l2jmobius.gameserver.model.siege.Castle;
 import org.l2jmobius.gameserver.model.siege.Castle.CastleFunction;
 import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.model.siege.Fort.FortFunction;
-import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.CommonSkill;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.PacketLogger;
 
@@ -253,12 +252,8 @@ public class RequestRestartPoint implements IClientIncomingPacket
 				}
 				else if (player.destroyItemByItemId("Feather", 10649, 1, player, false) /* || player.destroyItemByItemId("Feather", 13300, 1, player, false) || player.destroyItemByItemId("Feather", 13128, 1, player, false) */)
 				{
-					final Skill skill = SkillData.getInstance().getSkill(7008, 1);
+					player.doRevive(100);
-					if (skill != null)
+					CommonSkill.FEATHER_OF_BLESSING.getSkill().applyEffects(player, player);
-					{
-						player.doRevive(100);
-						skill.applyEffects(player, player);
-					}
 				}
 				else
 				{

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/Die.java

@@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.clan.Clan;
 import org.l2jmobius.gameserver.model.siege.Castle;
 import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
-import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.CommonSkill;
 import org.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
@@ -63,10 +63,10 @@ public class Die implements IClientOutgoingPacket
 			
 			for (BuffInfo effect : creature.getEffectList().getEffects())
 			{
-				final Skill skill = effect.getSkill();
+				if (effect.getSkill().getId() == CommonSkill.FEATHER_OF_BLESSING.getId())
-				if (skill.getId() == 7008)
 				{
 					_delayFeather = effect.getTime();
+					break;
 				}
 			}
 			

L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/skill/CommonSkill.java

@@ -48,6 +48,7 @@ public enum CommonSkill
 	CREATE_COMMON(1320, 1),
 	DIVINE_INSPIRATION(1405, 1),
 	CARAVANS_SECRET_MEDICINE(2341, 1),
+	FEATHER_OF_BLESSING(7008, 1),
 	IMPRIT_OF_LIGHT(19034, 1),
 	IMPRIT_OF_DARKNESS(19035, 1),
 	ABILITY_OF_LIGHT(19032, 1),

L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java

@@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.clientpackets;
 import org.l2jmobius.commons.network.PacketReader;
 import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.data.xml.ClanHallData;
-import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.enums.TeleportWhereType;
 import org.l2jmobius.gameserver.instancemanager.CastleManager;
 import org.l2jmobius.gameserver.instancemanager.FortManager;
@@ -38,7 +37,7 @@ import org.l2jmobius.gameserver.model.siege.Castle;
 import org.l2jmobius.gameserver.model.siege.Castle.CastleFunction;
 import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.model.siege.Fort.FortFunction;
-import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.CommonSkill;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.PacketLogger;
 
@@ -253,12 +252,8 @@ public class RequestRestartPoint implements IClientIncomingPacket
 				}
 				else if (player.destroyItemByItemId("Feather", 10649, 1, player, false) /* || player.destroyItemByItemId("Feather", 13300, 1, player, false) || player.destroyItemByItemId("Feather", 13128, 1, player, false) */)
 				{
-					final Skill skill = SkillData.getInstance().getSkill(7008, 1);
+					player.doRevive(100);
-					if (skill != null)
+					CommonSkill.FEATHER_OF_BLESSING.getSkill().applyEffects(player, player);
-					{
-						player.doRevive(100);
-						skill.applyEffects(player, player);
-					}
 				}
 				else
 				{

L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/Die.java

@@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.clan.Clan;
 import org.l2jmobius.gameserver.model.siege.Castle;
 import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
-import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.CommonSkill;
 import org.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
@@ -63,10 +63,10 @@ public class Die implements IClientOutgoingPacket
 			
 			for (BuffInfo effect : creature.getEffectList().getEffects())
 			{
-				final Skill skill = effect.getSkill();
+				if (effect.getSkill().getId() == CommonSkill.FEATHER_OF_BLESSING.getId())
-				if (skill.getId() == 7008)
 				{
 					_delayFeather = effect.getTime();
+					break;
 				}
 			}
 			

L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/skill/CommonSkill.java

@@ -48,6 +48,7 @@ public enum CommonSkill
 	CREATE_COMMON(1320, 1),
 	DIVINE_INSPIRATION(1405, 1),
 	CARAVANS_SECRET_MEDICINE(2341, 1),
+	FEATHER_OF_BLESSING(7008, 1),
 	IMPRIT_OF_LIGHT(19034, 1),
 	IMPRIT_OF_DARKNESS(19035, 1),
 	ABILITY_OF_LIGHT(19032, 1),

L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java

@@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.clientpackets;
 import org.l2jmobius.commons.network.PacketReader;
 import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.data.xml.ClanHallData;
-import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.enums.TeleportWhereType;
 import org.l2jmobius.gameserver.instancemanager.CastleManager;
 import org.l2jmobius.gameserver.instancemanager.FortManager;
@@ -38,7 +37,7 @@ import org.l2jmobius.gameserver.model.siege.Castle;
 import org.l2jmobius.gameserver.model.siege.Castle.CastleFunction;
 import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.model.siege.Fort.FortFunction;
-import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.CommonSkill;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.PacketLogger;
 
@@ -253,12 +252,8 @@ public class RequestRestartPoint implements IClientIncomingPacket
 				}
 				else if (player.destroyItemByItemId("Feather", 10649, 1, player, false) /* || player.destroyItemByItemId("Feather", 13300, 1, player, false) || player.destroyItemByItemId("Feather", 13128, 1, player, false) */)
 				{
-					final Skill skill = SkillData.getInstance().getSkill(7008, 1);
+					player.doRevive(100);
-					if (skill != null)
+					CommonSkill.FEATHER_OF_BLESSING.getSkill().applyEffects(player, player);
-					{
-						player.doRevive(100);
-						skill.applyEffects(player, player);
-					}
 				}
 				else
 				{

L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/Die.java

@@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.clan.Clan;
 import org.l2jmobius.gameserver.model.siege.Castle;
 import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
-import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.CommonSkill;
 import org.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
@@ -63,10 +63,10 @@ public class Die implements IClientOutgoingPacket
 			
 			for (BuffInfo effect : creature.getEffectList().getEffects())
 			{
-				final Skill skill = effect.getSkill();
+				if (effect.getSkill().getId() == CommonSkill.FEATHER_OF_BLESSING.getId())
-				if (skill.getId() == 7008)
 				{
 					_delayFeather = effect.getTime();
+					break;
 				}
 			}
 			

L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/skill/CommonSkill.java

@@ -48,6 +48,7 @@ public enum CommonSkill
 	CREATE_COMMON(1320, 1),
 	DIVINE_INSPIRATION(1405, 1),
 	CARAVANS_SECRET_MEDICINE(2341, 1),
+	FEATHER_OF_BLESSING(7008, 1),
 	IMPRIT_OF_LIGHT(19034, 1),
 	IMPRIT_OF_DARKNESS(19035, 1),
 	ABILITY_OF_LIGHT(19032, 1),

L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java

@@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.clientpackets;
 import org.l2jmobius.commons.network.PacketReader;
 import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.data.xml.ClanHallData;
-import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.enums.TeleportWhereType;
 import org.l2jmobius.gameserver.instancemanager.CastleManager;
 import org.l2jmobius.gameserver.instancemanager.FortManager;
@@ -38,7 +37,7 @@ import org.l2jmobius.gameserver.model.siege.Castle;
 import org.l2jmobius.gameserver.model.siege.Castle.CastleFunction;
 import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.model.siege.Fort.FortFunction;
-import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.CommonSkill;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.PacketLogger;
 
@@ -253,12 +252,8 @@ public class RequestRestartPoint implements IClientIncomingPacket
 				}
 				else if (player.destroyItemByItemId("Feather", 10649, 1, player, false) /* || player.destroyItemByItemId("Feather", 13300, 1, player, false) || player.destroyItemByItemId("Feather", 13128, 1, player, false) */)
 				{
-					final Skill skill = SkillData.getInstance().getSkill(7008, 1);
+					player.doRevive(100);
-					if (skill != null)
+					CommonSkill.FEATHER_OF_BLESSING.getSkill().applyEffects(player, player);
-					{
-						player.doRevive(100);
-						skill.applyEffects(player, player);
-					}
 				}
 				else
 				{

L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/Die.java

@@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.clan.Clan;
 import org.l2jmobius.gameserver.model.siege.Castle;
 import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
-import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.CommonSkill;
 import org.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
@@ -63,10 +63,10 @@ public class Die implements IClientOutgoingPacket
 			
 			for (BuffInfo effect : creature.getEffectList().getEffects())
 			{
-				final Skill skill = effect.getSkill();
+				if (effect.getSkill().getId() == CommonSkill.FEATHER_OF_BLESSING.getId())
-				if (skill.getId() == 7008)
 				{
 					_delayFeather = effect.getTime();
+					break;
 				}
 			}
 			

L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/skill/CommonSkill.java

@@ -48,6 +48,7 @@ public enum CommonSkill
 	CREATE_COMMON(1320, 1),
 	DIVINE_INSPIRATION(1405, 1),
 	CARAVANS_SECRET_MEDICINE(2341, 1),
+	FEATHER_OF_BLESSING(7008, 1),
 	IMPRIT_OF_LIGHT(19034, 1),
 	IMPRIT_OF_DARKNESS(19035, 1),
 	ABILITY_OF_LIGHT(19032, 1),

L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java

@@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.clientpackets;
 import org.l2jmobius.commons.network.PacketReader;
 import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.data.xml.ClanHallData;
-import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.enums.TeleportWhereType;
 import org.l2jmobius.gameserver.instancemanager.CastleManager;
 import org.l2jmobius.gameserver.instancemanager.FortManager;
@@ -38,7 +37,7 @@ import org.l2jmobius.gameserver.model.siege.Castle;
 import org.l2jmobius.gameserver.model.siege.Castle.CastleFunction;
 import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.model.siege.Fort.FortFunction;
-import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.CommonSkill;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.PacketLogger;
 
@@ -253,12 +252,8 @@ public class RequestRestartPoint implements IClientIncomingPacket
 				}
 				else if (player.destroyItemByItemId("Feather", 10649, 1, player, false) /* || player.destroyItemByItemId("Feather", 13300, 1, player, false) || player.destroyItemByItemId("Feather", 13128, 1, player, false) */)
 				{
-					final Skill skill = SkillData.getInstance().getSkill(7008, 1);
+					player.doRevive(100);
-					if (skill != null)
+					CommonSkill.FEATHER_OF_BLESSING.getSkill().applyEffects(player, player);
-					{
-						player.doRevive(100);
-						skill.applyEffects(player, player);
-					}
 				}
 				else
 				{

L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/Die.java

@@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.clan.Clan;
 import org.l2jmobius.gameserver.model.siege.Castle;
 import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
-import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.CommonSkill;
 import org.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
@@ -63,10 +63,10 @@ public class Die implements IClientOutgoingPacket
 			
 			for (BuffInfo effect : creature.getEffectList().getEffects())
 			{
-				final Skill skill = effect.getSkill();
+				if (effect.getSkill().getId() == CommonSkill.FEATHER_OF_BLESSING.getId())
-				if (skill.getId() == 7008)
 				{
 					_delayFeather = effect.getTime();
+					break;
 				}
 			}