BETA/STABLE: displayId for abnormal icon and gm/clan fix

L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2Effect.java

@@ -89,24 +89,24 @@ public abstract class L2Effect implements IChanceSkillTrigger
 	private int _periodStartTicks;
 	private int _periodFirstTime;
 	
-	private EffectTemplate _template;
+	private final EffectTemplate _template;
 	
 	// function templates
 	private final FuncTemplate[] _funcTemplates;
 	
 	//initial count
-	private int _totalCount;
+	private final int _totalCount;
 	// counter
 	private int _count;
 	
 	// abnormal effect mask
-	private AbnormalEffect _abnormalEffect;
+	private final AbnormalEffect _abnormalEffect;
 	// special effect mask
-	private AbnormalEffect[] _specialEffect;
+	private final AbnormalEffect[] _specialEffect;
 	// event effect mask
-	private AbnormalEffect _eventEffect;
+	private final AbnormalEffect _eventEffect;
 	// show icon
-	private boolean _icon;
+	private final boolean _icon;
 	// is self effect?
 	private boolean _isSelfEffect = false;
 	// is passive effect?
@@ -580,14 +580,14 @@ public abstract class L2Effect implements IChanceSkillTrigger
 		if (_totalCount > 1)
 		{
 			if (sk.isPotion())
-				mi.addEffect(sk.getId(), getLevel(), sk.getBuffDuration() - (getTaskTime() * 1000));
+				mi.addEffect(sk.getDisplayId(), getLevel(), sk.getBuffDuration() - (getTaskTime() * 1000));
 			else
-				mi.addEffect(sk.getId(), getLevel(), -1);
+				mi.addEffect(sk.getDisplayId(), getLevel(), -1);
 		}
 		else if (future != null)
-			mi.addEffect(sk.getId(), getLevel(), (int) future.getDelay(TimeUnit.MILLISECONDS));
+			mi.addEffect(sk.getDisplayId(), getLevel(), (int) future.getDelay(TimeUnit.MILLISECONDS));
 		else if (_abnormalTime == -1)
-			mi.addEffect(sk.getId(), getLevel(), _abnormalTime);
+			mi.addEffect(sk.getDisplayId(), getLevel(), _abnormalTime);
 	}
 	
 	public final void addPartySpelledIcon(PartySpelled ps)
@@ -598,9 +598,9 @@ public abstract class L2Effect implements IChanceSkillTrigger
 		final ScheduledFuture<?> future = _currentFuture;
 		final L2Skill sk = getSkill();
 		if (future != null)
-			ps.addPartySpelledEffect(sk.getId(), getLevel(), (int) future.getDelay(TimeUnit.MILLISECONDS));
+			ps.addPartySpelledEffect(sk.getDisplayId(), getLevel(), (int) future.getDelay(TimeUnit.MILLISECONDS));
 		else if (_abnormalTime == -1)
-			ps.addPartySpelledEffect(sk.getId(), getLevel(), _abnormalTime);
+			ps.addPartySpelledEffect(sk.getDisplayId(), getLevel(), _abnormalTime);
 	}
 	
 	public final void addOlympiadSpelledIcon(ExOlympiadSpelledInfo os)
@@ -611,9 +611,9 @@ public abstract class L2Effect implements IChanceSkillTrigger
 		final ScheduledFuture<?> future = _currentFuture;
 		final L2Skill sk = getSkill();
 		if (future != null)
-			os.addEffect(sk.getId(), getLevel(), (int) future.getDelay(TimeUnit.MILLISECONDS));
+			os.addEffect(sk.getDisplayId(), getLevel(), (int) future.getDelay(TimeUnit.MILLISECONDS));
 		else if (_abnormalTime == -1)
-			os.addEffect(sk.getId(), getLevel(), _abnormalTime);
+			os.addEffect(sk.getDisplayId(), getLevel(), _abnormalTime);
 	}
 	
 	public int getLevel()

L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/GMViewSkillInfo.java

@@ -22,7 +22,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 public class GMViewSkillInfo extends L2GameServerPacket
 {
 	private static final String _S__91_GMViewSkillInfo = "[S] 97 GMViewSkillInfo";
-	private L2PcInstance _activeChar;
+	private final L2PcInstance _activeChar;
 	private L2Skill[] _skills;
 	
 	public GMViewSkillInfo (L2PcInstance cha)
@@ -48,9 +48,9 @@ public class GMViewSkillInfo extends L2GameServerPacket
 		{
 			writeD(skill.isPassive() ? 1 : 0);
 			writeD(skill.getLevel());
-			writeD(skill.getId());
+			writeD(skill.getDisplayId());
 			writeC(isDisabled && skill.isClanSkill() ? 1 : 0);
-			writeC(SkillTable.getInstance().isEnchantable(skill.getId()) ? 1 : 0);
+			writeC(SkillTable.getInstance().isEnchantable(skill.getDisplayId()) ? 1 : 0);
 		}
 	}
 	

L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/PledgeSkillList.java

@@ -24,8 +24,8 @@ import com.l2jserver.gameserver.model.L2Skill;
 public class PledgeSkillList extends L2GameServerPacket
 {
 	private static final String _S__FE_39_PLEDGESKILLLIST = "[S] FE:3A PledgeSkillList";
-	private L2Skill[] _skills;
-	private SubPledgeSkill[] _subSkills;
+	private final L2Skill[] _skills;
+	private final SubPledgeSkill[] _subSkills;
 	
 	public static class SubPledgeSkill
 	{
@@ -57,7 +57,7 @@ public class PledgeSkillList extends L2GameServerPacket
 		writeD(_subSkills.length); //Squad skill length
 		for (L2Skill sk : _skills)
 		{
-			writeD(sk.getId());
+			writeD(sk.getDisplayId());
 			writeD(sk.getLevel());
 		}
 		for (SubPledgeSkill sk : _subSkills)