Changeset 5146


Ignore:
Timestamp:
Jan 24, 2012 9:26:19 AM (4 months ago)
Author:
Zoey76
Message:

BETA: Classes rearranging:

  • Moving char/npc templates to model/actor/templates.
  • Moving skill related classes to model/skills/.
  • Moving effect related classes to model/effects/.
  • Moving some other related classes to model/items or model/skills.
  • Moving conditions to model/conditions (they're not for skills only).
  • Moving DocumentBase?, DocumentItem?, DocumentSkill? to engines/.
  • Renaming SkillEngine? to DocumentEngine? (it's not for skills only).
  • Renaming L2SummonInstance to L2ServitorInstance, summons are all "summoned" NPCs such as pets and servitors, servitors are those summoned by class skills.
  • Added L2SkillOpType enum, contains current operative types and new ones.
  • Added EffectState? enum.


Note: Empty folders and minor fixes will be done in following commits, due Trac's limitations.

Location:
branches/unstable/L2J_Server_BETA
Files:
15 added
1 deleted
369 edited
9 copied
132 moved

Legend:

Unmodified
Added
Removed

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/ItemsAutoDestroy.java

    r5083 r5146  
    2323import com.l2jserver.gameserver.instancemanager.ItemsOnGroundManager; 
    2424import com.l2jserver.gameserver.model.L2World; 
    25 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    26 import com.l2jserver.gameserver.model.item.type.L2EtcItemType; 
     25import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
     26import com.l2jserver.gameserver.model.items.type.L2EtcItemType; 
    2727 
    2828public class ItemsAutoDestroy 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/MonsterRace.java

    r5013 r5146  
    2222import com.l2jserver.gameserver.idfactory.IdFactory; 
    2323import com.l2jserver.gameserver.model.actor.L2Npc; 
    24 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
     24import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    2525import com.l2jserver.util.Rnd; 
    2626 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/RecipeController.java

    r5093 r5146  
    4040import com.l2jserver.gameserver.model.L2RecipeList; 
    4141import com.l2jserver.gameserver.model.L2RecipeStatInstance; 
    42 import com.l2jserver.gameserver.model.L2Skill; 
    4342import com.l2jserver.gameserver.model.StatsSet; 
    4443import com.l2jserver.gameserver.model.TempItem; 
    4544import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    46 import com.l2jserver.gameserver.model.item.L2Item; 
    47 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    4845import com.l2jserver.gameserver.model.itemcontainer.Inventory; 
     46import com.l2jserver.gameserver.model.items.L2Item; 
     47import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
     48import com.l2jserver.gameserver.model.skills.L2Skill; 
     49import com.l2jserver.gameserver.model.stats.Stats; 
    4950import com.l2jserver.gameserver.network.SystemMessageId; 
    5051import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 
    … …  
    5758import com.l2jserver.gameserver.network.serverpackets.StatusUpdate; 
    5859import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    59 import com.l2jserver.gameserver.skills.Stats; 
    6060import com.l2jserver.gameserver.taskmanager.AttackStanceTaskManager; 
    6161import com.l2jserver.gameserver.util.Util; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/SevenSignsFestival.java

    r5083 r5146  
    5151import com.l2jserver.gameserver.model.actor.instance.L2FestivalMonsterInstance; 
    5252import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    53 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     53import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
     54import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    5455import com.l2jserver.gameserver.network.NpcStringId; 
    5556import com.l2jserver.gameserver.network.SystemMessageId; 
    … …  
    5859import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse; 
    5960import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    60 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    6161import com.l2jserver.gameserver.util.Util; 
    6262import com.l2jserver.util.Rnd; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/ai/AbstractAI.java

    r5056 r5146  
    2727import com.l2jserver.gameserver.model.L2CharPosition; 
    2828import com.l2jserver.gameserver.model.L2Object; 
    29 import com.l2jserver.gameserver.model.L2Skill; 
    3029import com.l2jserver.gameserver.model.actor.L2Character; 
    3130import com.l2jserver.gameserver.model.actor.L2Summon; 
    3231import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     32import com.l2jserver.gameserver.model.skills.L2Skill; 
    3333import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 
    3434import com.l2jserver.gameserver.network.serverpackets.AutoAttackStart; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/ai/L2AttackableAI.java

    r5094 r5146  
    3535import com.l2jserver.gameserver.model.L2CharPosition; 
    3636import com.l2jserver.gameserver.model.L2Object; 
    37 import com.l2jserver.gameserver.model.L2Skill; 
    3837import com.l2jserver.gameserver.model.actor.L2Attackable; 
    3938import com.l2jserver.gameserver.model.actor.L2Character; 
    … …  
    5049import com.l2jserver.gameserver.model.actor.instance.L2RaidBossInstance; 
    5150import com.l2jserver.gameserver.model.actor.instance.L2RiftInvaderInstance; 
     51import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
     52import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate.AIType; 
     53import com.l2jserver.gameserver.model.effects.L2EffectType; 
    5254import com.l2jserver.gameserver.model.quest.Quest; 
    53 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    54 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate.AIType; 
    55 import com.l2jserver.gameserver.templates.skills.L2EffectType; 
    56 import com.l2jserver.gameserver.templates.skills.L2SkillType; 
    57 import com.l2jserver.gameserver.templates.skills.L2TargetType; 
     55import com.l2jserver.gameserver.model.skills.L2Skill; 
     56import com.l2jserver.gameserver.model.skills.L2SkillType; 
     57import com.l2jserver.gameserver.model.skills.targets.L2TargetType; 
    5858import com.l2jserver.gameserver.util.Util; 
    5959import com.l2jserver.util.Rnd; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/ai/L2CharacterAI.java

    r5093 r5146  
    3333import com.l2jserver.gameserver.instancemanager.WalkingManager; 
    3434import com.l2jserver.gameserver.model.L2CharPosition; 
    35 import com.l2jserver.gameserver.model.L2Effect; 
    3635import com.l2jserver.gameserver.model.L2Object; 
    37 import com.l2jserver.gameserver.model.L2Skill; 
    3836import com.l2jserver.gameserver.model.actor.L2Attackable; 
    3937import com.l2jserver.gameserver.model.actor.L2Character; 
    … …  
    4240import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance; 
    4341import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    44 import com.l2jserver.gameserver.model.item.L2Weapon; 
    45 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    46 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance.ItemLocation; 
    47 import com.l2jserver.gameserver.model.item.type.L2WeaponType; 
     42import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
     43import com.l2jserver.gameserver.model.effects.L2Effect; 
     44import com.l2jserver.gameserver.model.items.L2Weapon; 
     45import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
     46import com.l2jserver.gameserver.model.items.instance.L2ItemInstance.ItemLocation; 
     47import com.l2jserver.gameserver.model.items.type.L2WeaponType; 
     48import com.l2jserver.gameserver.model.skills.L2Skill; 
     49import com.l2jserver.gameserver.model.skills.L2SkillType; 
     50import com.l2jserver.gameserver.model.skills.targets.L2TargetType; 
    4851import com.l2jserver.gameserver.network.SystemMessageId; 
    4952import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 
    5053import com.l2jserver.gameserver.network.serverpackets.AutoAttackStop; 
    5154import com.l2jserver.gameserver.taskmanager.AttackStanceTaskManager; 
    52 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    53 import com.l2jserver.gameserver.templates.skills.L2SkillType; 
    54 import com.l2jserver.gameserver.templates.skills.L2TargetType; 
    5555import com.l2jserver.gameserver.util.Point3D; 
    5656import com.l2jserver.util.Rnd; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/ai/L2ControllableMobAI.java

    r5092 r5146  
    2626 
    2727import com.l2jserver.gameserver.model.L2Object; 
    28 import com.l2jserver.gameserver.model.L2Skill; 
    2928import com.l2jserver.gameserver.model.MobGroup; 
    3029import com.l2jserver.gameserver.model.MobGroupTable; 
    … …  
    3837import com.l2jserver.gameserver.model.actor.instance.L2NpcInstance; 
    3938import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     39import com.l2jserver.gameserver.model.skills.L2Skill; 
    4040import com.l2jserver.gameserver.util.Util; 
    4141import com.l2jserver.util.Rnd; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/ai/L2DoorAI.java

    r4981 r5146  
    1818import com.l2jserver.gameserver.model.L2CharPosition; 
    1919import com.l2jserver.gameserver.model.L2Object; 
    20 import com.l2jserver.gameserver.model.L2Skill; 
    2120import com.l2jserver.gameserver.model.actor.L2Character; 
    2221import com.l2jserver.gameserver.model.actor.instance.L2DefenderInstance; 
    2322import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance; 
     23import com.l2jserver.gameserver.model.skills.L2Skill; 
    2424 
    2525/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/ai/L2FortSiegeGuardAI.java

    r5010 r5146  
    2626import com.l2jserver.gameserver.GeoData; 
    2727import com.l2jserver.gameserver.ThreadPoolManager; 
    28 import com.l2jserver.gameserver.model.L2Effect; 
    2928import com.l2jserver.gameserver.model.L2Object; 
    30 import com.l2jserver.gameserver.model.L2Skill; 
    3129import com.l2jserver.gameserver.model.actor.L2Attackable; 
    3230import com.l2jserver.gameserver.model.actor.L2Character; 
    … …  
    4038import com.l2jserver.gameserver.model.actor.instance.L2NpcInstance; 
    4139import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    42 import com.l2jserver.gameserver.templates.skills.L2SkillType; 
     40import com.l2jserver.gameserver.model.effects.L2Effect; 
     41import com.l2jserver.gameserver.model.skills.L2Skill; 
     42import com.l2jserver.gameserver.model.skills.L2SkillType; 
    4343import com.l2jserver.gameserver.util.Util; 
    4444import com.l2jserver.util.Rnd; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/ai/L2PlayableAI.java

    r4417 r5146  
    1616 
    1717import com.l2jserver.gameserver.model.L2Object; 
    18 import com.l2jserver.gameserver.model.L2Skill; 
    1918import com.l2jserver.gameserver.model.actor.L2Character; 
    2019import com.l2jserver.gameserver.model.actor.L2Character.AIAccessor; 
    2120import com.l2jserver.gameserver.model.actor.L2Playable; 
     21import com.l2jserver.gameserver.model.skills.L2Skill; 
    2222import com.l2jserver.gameserver.network.SystemMessageId; 
    2323 
    … …  
    9898         
    9999        /** 
    100          * @see com.l2jserver.gameserver.ai.L2CharacterAI#onIntentionCast(com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object) 
     100         * @see com.l2jserver.gameserver.ai.L2CharacterAI#onIntentionCast(com.l2jserver.gameserver.model.skills.L2Skill, com.l2jserver.gameserver.model.L2Object) 
    101101         */ 
    102102        @Override 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/ai/L2PlayerAI.java

    r4975 r5146  
    2626import com.l2jserver.gameserver.model.L2CharPosition; 
    2727import com.l2jserver.gameserver.model.L2Object; 
    28 import com.l2jserver.gameserver.model.L2Skill; 
    2928import com.l2jserver.gameserver.model.actor.L2Character; 
    3029import com.l2jserver.gameserver.model.actor.L2Character.AIAccessor; 
    3130import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    3231import com.l2jserver.gameserver.model.actor.instance.L2StaticObjectInstance; 
    33 import com.l2jserver.gameserver.templates.skills.L2TargetType; 
     32import com.l2jserver.gameserver.model.skills.L2Skill; 
     33import com.l2jserver.gameserver.model.skills.targets.L2TargetType; 
    3434 
    3535public class L2PlayerAI extends L2PlayableAI 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/ai/L2SiegeGuardAI.java

    r5010 r5146  
    2525import com.l2jserver.gameserver.GeoData; 
    2626import com.l2jserver.gameserver.ThreadPoolManager; 
    27 import com.l2jserver.gameserver.model.L2Effect; 
    2827import com.l2jserver.gameserver.model.L2Object; 
    29 import com.l2jserver.gameserver.model.L2Skill; 
    3028import com.l2jserver.gameserver.model.actor.L2Attackable; 
    3129import com.l2jserver.gameserver.model.actor.L2Character; 
    … …  
    3735import com.l2jserver.gameserver.model.actor.instance.L2NpcInstance; 
    3836import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    39 import com.l2jserver.gameserver.templates.skills.L2SkillType; 
     37import com.l2jserver.gameserver.model.effects.L2Effect; 
     38import com.l2jserver.gameserver.model.skills.L2Skill; 
     39import com.l2jserver.gameserver.model.skills.L2SkillType; 
    4040import com.l2jserver.gameserver.util.Util; 
    4141import com.l2jserver.util.Rnd; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/ai/L2SummonAI.java

    r4981 r5146  
    2525import com.l2jserver.gameserver.ThreadPoolManager; 
    2626import com.l2jserver.gameserver.model.L2Object; 
    27 import com.l2jserver.gameserver.model.L2Skill; 
    2827import com.l2jserver.gameserver.model.actor.L2Character; 
    2928import com.l2jserver.gameserver.model.actor.L2Character.AIAccessor; 
    3029import com.l2jserver.gameserver.model.actor.L2Summon; 
     30import com.l2jserver.gameserver.model.skills.L2Skill; 
    3131import com.l2jserver.util.Rnd; 
    3232 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/ai/L2VehicleAI.java

    r4921 r5146  
    1616 
    1717import com.l2jserver.gameserver.model.L2Object; 
    18 import com.l2jserver.gameserver.model.L2Skill; 
    1918import com.l2jserver.gameserver.model.actor.L2Character; 
    2019import com.l2jserver.gameserver.model.actor.L2Vehicle; 
     20import com.l2jserver.gameserver.model.skills.L2Skill; 
    2121 
    2222/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/AugmentationData.java

    r5083 r5146  
    3333import com.l2jserver.Config; 
    3434import com.l2jserver.gameserver.model.L2Augmentation; 
    35 import com.l2jserver.gameserver.model.L2Skill; 
    36 import com.l2jserver.gameserver.model.item.L2Item; 
     35import com.l2jserver.gameserver.model.items.L2Item; 
     36import com.l2jserver.gameserver.model.skills.L2Skill; 
     37import com.l2jserver.gameserver.model.stats.Stats; 
    3738import com.l2jserver.gameserver.network.clientpackets.AbstractRefinePacket; 
    38 import com.l2jserver.gameserver.skills.Stats; 
    3939import com.l2jserver.util.Rnd; 
    4040 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/CharSummonTable.java

    r5083 r5146  
    3131import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    3232import com.l2jserver.gameserver.model.actor.instance.L2PetInstance; 
     33import com.l2jserver.gameserver.model.actor.instance.L2ServitorInstance; 
    3334import com.l2jserver.gameserver.model.actor.instance.L2SiegeSummonInstance; 
    34 import com.l2jserver.gameserver.model.actor.instance.L2SummonInstance; 
    35 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     35import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
     36import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
     37import com.l2jserver.gameserver.model.skills.l2skills.L2SkillSummon; 
    3638import com.l2jserver.gameserver.network.serverpackets.PetItemList; 
    37 import com.l2jserver.gameserver.skills.l2skills.L2SkillSummon; 
    38 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    3939 
    4040/** 
    … …  
    136136        } 
    137137         
    138         public void saveSummon(L2SummonInstance summon) 
     138        public void saveSummon(L2ServitorInstance summon) 
    139139        { 
    140140                if (summon == null || summon.getTimeRemaining() <= 0) 
    … …  
    182182                         
    183183                        L2NpcTemplate summonTemplate; 
    184                         L2SummonInstance summon; 
     184                        L2ServitorInstance summon; 
    185185                        L2SkillSummon skill; 
    186186                         
    … …  
    213213                                { 
    214214                                        // TODO: Confirm L2Merchant summon = new L2MerchantSummonInstance(id, summonTemplate, activeChar, skill); 
    215                                         summon = new L2SummonInstance(id, summonTemplate, activeChar, skill); 
     215                                        summon = new L2ServitorInstance(id, summonTemplate, activeChar, skill); 
    216216                                } 
    217217                                else 
    218218                                { 
    219                                         summon = new L2SummonInstance(id, summonTemplate, activeChar, skill); 
     219                                        summon = new L2ServitorInstance(id, summonTemplate, activeChar, skill); 
    220220                                } 
    221221                                 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/CharTemplateTable.java

    r5083 r5146  
    2424import com.l2jserver.L2DatabaseFactory; 
    2525import com.l2jserver.gameserver.model.StatsSet; 
     26import com.l2jserver.gameserver.model.actor.templates.L2PcTemplate; 
    2627import com.l2jserver.gameserver.model.base.ClassId; 
    27 import com.l2jserver.gameserver.templates.chars.L2PcTemplate; 
    2828 
    2929/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/DoorTable.java

    r5083 r5146  
    3535import com.l2jserver.gameserver.model.StatsSet; 
    3636import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance; 
     37import com.l2jserver.gameserver.model.actor.templates.L2CharTemplate; 
    3738import com.l2jserver.gameserver.model.entity.ClanHall; 
    3839import com.l2jserver.gameserver.model.entity.clanhall.SiegableHall; 
    3940import com.l2jserver.gameserver.pathfinding.AbstractNodeLoc; 
    40 import com.l2jserver.gameserver.templates.chars.L2CharTemplate; 
    4141 
    4242public class DoorTable 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/EnchantGroupsTable.java

    r4972 r5146  
    2727import com.l2jserver.gameserver.model.L2EnchantSkillGroup.EnchantSkillDetail; 
    2828import com.l2jserver.gameserver.model.L2EnchantSkillLearn; 
    29 import com.l2jserver.gameserver.model.L2Skill; 
    3029import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     30import com.l2jserver.gameserver.model.skills.L2Skill; 
    3131 
    3232/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/EnchantHPBonusData.java

    r5126 r5146  
    3030 
    3131import com.l2jserver.Config; 
    32 import com.l2jserver.gameserver.model.item.L2Item; 
    33 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    34 import com.l2jserver.gameserver.skills.Stats; 
    35 import com.l2jserver.gameserver.skills.funcs.FuncTemplate; 
    36 import com.l2jserver.gameserver.skills.funcs.LambdaConst; 
     32import com.l2jserver.gameserver.model.items.L2Item; 
     33import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
     34import com.l2jserver.gameserver.model.skills.funcs.FuncTemplate; 
     35import com.l2jserver.gameserver.model.skills.funcs.LambdaConst; 
     36import com.l2jserver.gameserver.model.stats.Stats; 
    3737 
    3838/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/EnchantItemTable.java

    r5099 r5146  
    3333import com.l2jserver.gameserver.model.EnchantItem; 
    3434import com.l2jserver.gameserver.model.EnchantScroll; 
    35 import com.l2jserver.gameserver.model.item.L2Item; 
    36 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     35import com.l2jserver.gameserver.model.items.L2Item; 
     36import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    3737 
    3838 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/GMSkillTable.java

    r4858 r5146  
    1515package com.l2jserver.gameserver.datatables; 
    1616 
    17 import com.l2jserver.gameserver.model.L2Skill; 
    1817import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     18import com.l2jserver.gameserver.model.skills.L2Skill; 
    1919import com.l2jserver.gameserver.util.Util; 
    2020 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/HennaTable.java

    r5083 r5146  
    2525import com.l2jserver.L2DatabaseFactory; 
    2626import com.l2jserver.gameserver.model.StatsSet; 
    27 import com.l2jserver.gameserver.model.item.L2Henna; 
     27import com.l2jserver.gameserver.model.items.L2Henna; 
    2828 
    2929/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/HennaTreeTable.java

    r5083 r5146  
    2828import com.l2jserver.L2DatabaseFactory; 
    2929import com.l2jserver.gameserver.model.base.ClassId; 
    30 import com.l2jserver.gameserver.model.item.L2Henna; 
    31 import com.l2jserver.gameserver.model.item.instance.L2HennaInstance; 
     30import com.l2jserver.gameserver.model.items.L2Henna; 
     31import com.l2jserver.gameserver.model.items.instance.L2HennaInstance; 
    3232 
    3333/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/HeroSkillTable.java

    r3928 r5146  
    1515package com.l2jserver.gameserver.datatables; 
    1616 
    17 import com.l2jserver.gameserver.model.L2Skill; 
     17import com.l2jserver.gameserver.model.skills.L2Skill; 
    1818 
    1919/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/ItemTable.java

    r5083 r5146  
    3030import com.l2jserver.Config; 
    3131import com.l2jserver.L2DatabaseFactory; 
    32 import com.l2jserver.gameserver.Item; 
    3332import com.l2jserver.gameserver.ThreadPoolManager; 
     33import com.l2jserver.gameserver.engines.DocumentEngine; 
     34import com.l2jserver.gameserver.engines.items.Item; 
    3435import com.l2jserver.gameserver.idfactory.IdFactory; 
    3536import com.l2jserver.gameserver.model.L2Object; 
    … …  
    3839import com.l2jserver.gameserver.model.actor.instance.L2EventMonsterInstance; 
    3940import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    40 import com.l2jserver.gameserver.model.item.L2Armor; 
    41 import com.l2jserver.gameserver.model.item.L2EtcItem; 
    42 import com.l2jserver.gameserver.model.item.L2Item; 
    43 import com.l2jserver.gameserver.model.item.L2Weapon; 
    44 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    45 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance.ItemLocation; 
    46 import com.l2jserver.gameserver.model.item.type.L2ArmorType; 
    47 import com.l2jserver.gameserver.model.item.type.L2WeaponType; 
    48 import com.l2jserver.gameserver.skills.SkillsEngine; 
     41import com.l2jserver.gameserver.model.items.L2Armor; 
     42import com.l2jserver.gameserver.model.items.L2EtcItem; 
     43import com.l2jserver.gameserver.model.items.L2Item; 
     44import com.l2jserver.gameserver.model.items.L2Weapon; 
     45import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
     46import com.l2jserver.gameserver.model.items.instance.L2ItemInstance.ItemLocation; 
     47import com.l2jserver.gameserver.model.items.type.L2ArmorType; 
     48import com.l2jserver.gameserver.model.items.type.L2WeaponType; 
    4949import com.l2jserver.gameserver.util.GMAudit; 
    5050 
    … …  
    196196                _etcItems.clear(); 
    197197                _weapons.clear(); 
    198                 for (L2Item item :  SkillsEngine.getInstance().loadItems()) 
     198                for (L2Item item :  DocumentEngine.getInstance().loadItems()) 
    199199                { 
    200200                        if (highest < item.getItemId()) 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/NobleSkillTable.java

    r3924 r5146  
    1515package com.l2jserver.gameserver.datatables; 
    1616 
    17 import com.l2jserver.gameserver.model.L2Skill; 
     17import com.l2jserver.gameserver.model.skills.L2Skill; 
    1818 
    1919/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/NpcTable.java

    r5137 r5146  
    3737import com.l2jserver.gameserver.model.L2MinionData; 
    3838import com.l2jserver.gameserver.model.L2NpcAIData; 
    39 import com.l2jserver.gameserver.model.L2Skill; 
    4039import com.l2jserver.gameserver.model.StatsSet; 
     40import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    4141import com.l2jserver.gameserver.model.base.ClassId; 
    4242import com.l2jserver.gameserver.model.quest.Quest; 
    4343import com.l2jserver.gameserver.model.quest.Quest.QuestEventType; 
    44 import com.l2jserver.gameserver.skills.BaseStats; 
    45 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
     44import com.l2jserver.gameserver.model.skills.L2Skill; 
     45import com.l2jserver.gameserver.model.stats.BaseStats; 
    4646 
    4747public class NpcTable 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/PetDataTable.java

    r5126 r5146  
    3131import com.l2jserver.gameserver.model.L2PetLevelData; 
    3232import com.l2jserver.gameserver.model.actor.instance.L2PetInstance; 
    33 import com.l2jserver.gameserver.model.item.L2Item; 
    34 import com.l2jserver.gameserver.model.item.type.L2EtcItemType; 
     33import com.l2jserver.gameserver.model.items.L2Item; 
     34import com.l2jserver.gameserver.model.items.type.L2EtcItemType; 
    3535 
    3636public class PetDataTable 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/SkillTable.java

    r5002 r5146  
    1919import java.util.logging.Logger; 
    2020 
    21 import com.l2jserver.gameserver.model.L2Skill; 
    22 import com.l2jserver.gameserver.skills.SkillsEngine; 
     21import com.l2jserver.gameserver.engines.DocumentEngine; 
     22import com.l2jserver.gameserver.model.skills.L2Skill; 
    2323 
    2424/** 
    … …  
    5656        { 
    5757                _skills.clear(); 
    58                 SkillsEngine.getInstance().loadAllSkills(_skills); 
     58                DocumentEngine.getInstance().loadAllSkills(_skills); 
    5959                 
    6060                _skillMaxLevel.clear(); 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/SkillTreesData.java

    r5083 r5146  
    3333import com.l2jserver.Config; 
    3434import com.l2jserver.gameserver.model.L2Clan; 
    35 import com.l2jserver.gameserver.model.L2Skill; 
    3635import com.l2jserver.gameserver.model.L2SkillLearn; 
    3736import com.l2jserver.gameserver.model.StatsSet; 
    … …  
    4039import com.l2jserver.gameserver.model.base.Race; 
    4140import com.l2jserver.gameserver.model.base.SubClass; 
     41import com.l2jserver.gameserver.model.skills.L2Skill; 
    4242import com.l2jserver.gameserver.util.Util; 
    4343import com.l2jserver.util.file.filter.XMLFilter; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/SpawnTable.java

    r5013 r5146  
    2929import com.l2jserver.gameserver.model.actor.L2Npc; 
    3030import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    31 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
     31import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    3232 
    3333/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/StaticObjects.java

    r5083 r5146  
    3030import com.l2jserver.gameserver.model.StatsSet; 
    3131import com.l2jserver.gameserver.model.actor.instance.L2StaticObjectInstance; 
    32 import com.l2jserver.gameserver.templates.chars.L2CharTemplate; 
     32import com.l2jserver.gameserver.model.actor.templates.L2CharTemplate; 
    3333 
    3434public class StaticObjects 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/SummonEffectsTable.java

    r4972 r5146  
    1919import java.util.List; 
    2020 
    21 import com.l2jserver.gameserver.model.L2Skill; 
    2221import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     22import com.l2jserver.gameserver.model.skills.L2Skill; 
    2323 
    2424/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/hitConditionBonus.java

    r5112 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills; 
     15package com.l2jserver.gameserver.datatables; 
    1616 
    1717import java.io.File; 
    … …  
    4545        //private static int rainBonus = 0; 
    4646         
    47         protected static double getConditionBonus(L2Character attacker, L2Character target) 
     47        public static double getConditionBonus(L2Character attacker, L2Character target) 
    4848        { 
    4949                double mod = 100; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/engines/DocumentBase.java

    r5145 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills; 
     15package com.l2jserver.gameserver.engines; 
    1616 
    1717import java.io.File; 
    … …  
    3636import com.l2jserver.gameserver.model.ChanceCondition; 
    3737import com.l2jserver.gameserver.model.L2Object.InstanceType; 
    38 import com.l2jserver.gameserver.model.L2Skill; 
    3938import com.l2jserver.gameserver.model.StatsSet; 
    4039import com.l2jserver.gameserver.model.base.PlayerState; 
    4140import com.l2jserver.gameserver.model.base.Race; 
    42 import com.l2jserver.gameserver.model.item.L2Item; 
    43 import com.l2jserver.gameserver.model.item.type.L2ArmorType; 
    44 import com.l2jserver.gameserver.model.item.type.L2WeaponType; 
    45 import com.l2jserver.gameserver.skills.conditions.Condition; 
    46 import com.l2jserver.gameserver.skills.conditions.ConditionChangeWeapon; 
    47 import com.l2jserver.gameserver.skills.conditions.ConditionForceBuff; 
    48 import com.l2jserver.gameserver.skills.conditions.ConditionGameChance; 
    49 import com.l2jserver.gameserver.skills.conditions.ConditionGameTime; 
    50 import com.l2jserver.gameserver.skills.conditions.ConditionGameTime.CheckGameTime; 
    51 import com.l2jserver.gameserver.skills.conditions.ConditionLogicAnd; 
    52 import com.l2jserver.gameserver.skills.conditions.ConditionLogicNot; 
    53 import com.l2jserver.gameserver.skills.conditions.ConditionLogicOr; 
    54 import com.l2jserver.gameserver.skills.conditions.ConditionMinDistance; 
    55 import com.l2jserver.gameserver.skills.conditions.ConditionPlayerActiveEffectId; 
    56 import com.l2jserver.gameserver.skills.conditions.ConditionPlayerActiveSkillId; 
    57 import com.l2jserver.gameserver.skills.conditions.ConditionPlayerAgathionId; 
    58 import com.l2jserver.gameserver.skills.conditions.ConditionPlayerCanSweep; 
    59 import com.l2jserver.gameserver.skills.conditions.ConditionPlayerCharges; 
    60 import com.l2jserver.gameserver.skills.conditions.ConditionPlayerClassIdRestriction; 
    61 import com.l2jserver.gameserver.skills.conditions.ConditionPlayerCloakStatus; 
    62 import com.l2jserver.gameserver.skills.conditions.ConditionPlayerCp; 
    63 import com.l2jserver.gameserver.skills.conditions.ConditionPlayerFlyMounted; 
    64 import com.l2jserver.gameserver.skills.conditions.ConditionPlayerGrade; 
    65 import com.l2jserver.gameserver.skills.conditions.ConditionPlayerHasCastle; 
    66 import com.l2jserver.gameserver.skills.conditions.ConditionPlayerHasClanHall; 
    67 import com.l2jserver.gameserver.skills.conditions.ConditionPlayerHasFort; 
    68 import com.l2jserver.gameserver.skills.conditions.ConditionPlayerHasPet; 
    69 import com.l2jserver.gameserver.skills.conditions.ConditionPlayerHp; 
    70 import com.l2jserver.gameserver.skills.conditions.ConditionPlayerInsideZoneId; 
    71 import com.l2jserver.gameserver.skills.conditions.ConditionPlayerInstanceId; 
    72 import com.l2jserver.gameserver.skills.conditions.ConditionPlayerInvSize; 
    73 import com.l2jserver.gameserver.skills.conditions.ConditionPlayerIsClanLeader; 
    74 import com.l2jserver.gameserver.skills.conditions.ConditionPlayerIsHero; 
    75 import com.l2jserver.gameserver.skills.conditions.ConditionPlayerLandingZone; 
    76 import com.l2jserver.gameserver.skills.conditions.ConditionPlayerLevel; 
    77 import com.l2jserver.gameserver.skills.conditions.ConditionPlayerLevelRange; 
    78 import com.l2jserver.gameserver.skills.conditions.ConditionPlayerMp; 
    79 import com.l2jserver.gameserver.skills.conditions.ConditionPlayerPkCount; 
    80 import com.l2jserver.gameserver.skills.conditions.ConditionPlayerPledgeClass; 
    81 import com.l2jserver.gameserver.skills.conditions.ConditionPlayerRace; 
    82 import com.l2jserver.gameserver.skills.conditions.ConditionPlayerRangeFromNpc; 
    83 import com.l2jserver.gameserver.skills.conditions.ConditionPlayerServitorNpcId; 
    84 import com.l2jserver.gameserver.skills.conditions.ConditionPlayerSex; 
    85 import com.l2jserver.gameserver.skills.conditions.ConditionPlayerSiegeSide; 
    86 import com.l2jserver.gameserver.skills.conditions.ConditionPlayerSouls; 
    87 import com.l2jserver.gameserver.skills.conditions.ConditionPlayerState; 
    88 import com.l2jserver.gameserver.skills.conditions.ConditionPlayerSubclass; 
    89 import com.l2jserver.gameserver.skills.conditions.ConditionPlayerTransformationId; 
    90 import com.l2jserver.gameserver.skills.conditions.ConditionPlayerTvTEvent; 
    91 import com.l2jserver.gameserver.skills.conditions.ConditionPlayerVehicleMounted; 
    92 import com.l2jserver.gameserver.skills.conditions.ConditionPlayerWeight; 
    93 import com.l2jserver.gameserver.skills.conditions.ConditionSiegeZone; 
    94 import com.l2jserver.gameserver.skills.conditions.ConditionSkillStats; 
    95 import com.l2jserver.gameserver.skills.conditions.ConditionSlotItemId; 
    96 import com.l2jserver.gameserver.skills.conditions.ConditionTargetAbnormal; 
    97 import com.l2jserver.gameserver.skills.conditions.ConditionTargetActiveEffectId; 
    98 import com.l2jserver.gameserver.skills.conditions.ConditionTargetActiveSkillId; 
    99 import com.l2jserver.gameserver.skills.conditions.ConditionTargetAggro; 
    100 import com.l2jserver.gameserver.skills.conditions.ConditionTargetClassIdRestriction; 
    101 import com.l2jserver.gameserver.skills.conditions.ConditionTargetLevel; 
    102 import com.l2jserver.gameserver.skills.conditions.ConditionTargetNpcId; 
    103 import com.l2jserver.gameserver.skills.conditions.ConditionTargetNpcType; 
    104 import com.l2jserver.gameserver.skills.conditions.ConditionTargetPlayable; 
    105 import com.l2jserver.gameserver.skills.conditions.ConditionTargetRace; 
    106 import com.l2jserver.gameserver.skills.conditions.ConditionTargetRaceId; 
    107 import com.l2jserver.gameserver.skills.conditions.ConditionTargetUsesWeaponKind; 
    108 import com.l2jserver.gameserver.skills.conditions.ConditionUsingItemType; 
    109 import com.l2jserver.gameserver.skills.conditions.ConditionUsingSkill; 
    110 import com.l2jserver.gameserver.skills.conditions.ConditionWithSkill; 
    111 import com.l2jserver.gameserver.skills.funcs.FuncTemplate; 
    112 import com.l2jserver.gameserver.skills.funcs.Lambda; 
    113 import com.l2jserver.gameserver.skills.funcs.LambdaCalc; 
    114 import com.l2jserver.gameserver.skills.funcs.LambdaConst; 
    115 import com.l2jserver.gameserver.skills.funcs.LambdaStats; 
    116 import com.l2jserver.gameserver.templates.effects.EffectTemplate; 
    117 import com.l2jserver.gameserver.templates.skills.L2SkillType; 
     41import com.l2jserver.gameserver.model.conditions.Condition; 
     42import com.l2jserver.gameserver.model.conditions.ConditionChangeWeapon; 
     43import com.l2jserver.gameserver.model.conditions.ConditionForceBuff; 
     44import com.l2jserver.gameserver.model.conditions.ConditionGameChance; 
     45import com.l2jserver.gameserver.model.conditions.ConditionGameTime; 
     46import com.l2jserver.gameserver.model.conditions.ConditionGameTime.CheckGameTime; 
     47import com.l2jserver.gameserver.model.conditions.ConditionLogicAnd; 
     48import com.l2jserver.gameserver.model.conditions.ConditionLogicNot; 
     49import com.l2jserver.gameserver.model.conditions.ConditionLogicOr; 
     50import com.l2jserver.gameserver.model.conditions.ConditionMinDistance; 
     51import com.l2jserver.gameserver.model.conditions.ConditionPlayerActiveEffectId; 
     52import com.l2jserver.gameserver.model.conditions.ConditionPlayerActiveSkillId; 
     53import com.l2jserver.gameserver.model.conditions.ConditionPlayerAgathionId; 
     54import com.l2jserver.gameserver.model.conditions.ConditionPlayerCanSweep; 
     55import com.l2jserver.gameserver.model.conditions.ConditionPlayerCharges; 
     56import com.l2jserver.gameserver.model.conditions.ConditionPlayerClassIdRestriction; 
     57import com.l2jserver.gameserver.model.conditions.ConditionPlayerCloakStatus; 
     58import com.l2jserver.gameserver.model.conditions.ConditionPlayerCp; 
     59import com.l2jserver.gameserver.model.conditions.ConditionPlayerFlyMounted; 
     60import com.l2jserver.gameserver.model.conditions.ConditionPlayerGrade; 
     61import com.l2jserver.gameserver.model.conditions.ConditionPlayerHasCastle; 
     62import com.l2jserver.gameserver.model.conditions.ConditionPlayerHasClanHall; 
     63import com.l2jserver.gameserver.model.conditions.ConditionPlayerHasFort; 
     64import com.l2jserver.gameserver.model.conditions.ConditionPlayerHasPet; 
     65import com.l2jserver.gameserver.model.conditions.ConditionPlayerHp; 
     66import com.l2jserver.gameserver.model.conditions.ConditionPlayerInsideZoneId; 
     67import com.l2jserver.gameserver.model.conditions.ConditionPlayerInstanceId; 
     68import com.l2jserver.gameserver.model.conditions.ConditionPlayerInvSize; 
     69import com.l2jserver.gameserver.model.conditions.ConditionPlayerIsClanLeader; 
     70import com.l2jserver.gameserver.model.conditions.ConditionPlayerIsHero; 
     71import com.l2jserver.gameserver.model.conditions.ConditionPlayerLandingZone; 
     72import com.l2jserver.gameserver.model.conditions.ConditionPlayerLevel; 
     73import com.l2jserver.gameserver.model.conditions.ConditionPlayerLevelRange; 
     74import com.l2jserver.gameserver.model.conditions.ConditionPlayerMp; 
     75import com.l2jserver.gameserver.model.conditions.ConditionPlayerPkCount; 
     76import com.l2jserver.gameserver.model.conditions.ConditionPlayerPledgeClass; 
     77import com.l2jserver.gameserver.model.conditions.ConditionPlayerRace; 
     78import com.l2jserver.gameserver.model.conditions.ConditionPlayerRangeFromNpc; 
     79import com.l2jserver.gameserver.model.conditions.ConditionPlayerServitorNpcId; 
     80import com.l2jserver.gameserver.model.conditions.ConditionPlayerSex; 
     81import com.l2jserver.gameserver.model.conditions.ConditionPlayerSiegeSide; 
     82import com.l2jserver.gameserver.model.conditions.ConditionPlayerSouls; 
     83import com.l2jserver.gameserver.model.conditions.ConditionPlayerState; 
     84import com.l2jserver.gameserver.model.conditions.ConditionPlayerSubclass; 
     85import com.l2jserver.gameserver.model.conditions.ConditionPlayerTransformationId; 
     86import com.l2jserver.gameserver.model.conditions.ConditionPlayerTvTEvent; 
     87import com.l2jserver.gameserver.model.conditions.ConditionPlayerVehicleMounted; 
     88import com.l2jserver.gameserver.model.conditions.ConditionPlayerWeight; 
     89import com.l2jserver.gameserver.model.conditions.ConditionSiegeZone; 
     90import com.l2jserver.gameserver.model.conditions.ConditionSkillStats; 
     91import com.l2jserver.gameserver.model.conditions.ConditionSlotItemId; 
     92import com.l2jserver.gameserver.model.conditions.ConditionTargetAbnormal; 
     93import com.l2jserver.gameserver.model.conditions.ConditionTargetActiveEffectId; 
     94import com.l2jserver.gameserver.model.conditions.ConditionTargetActiveSkillId; 
     95import com.l2jserver.gameserver.model.conditions.ConditionTargetAggro; 
     96import com.l2jserver.gameserver.model.conditions.ConditionTargetClassIdRestriction; 
     97import com.l2jserver.gameserver.model.conditions.ConditionTargetLevel; 
     98import com.l2jserver.gameserver.model.conditions.ConditionTargetNpcId; 
     99import com.l2jserver.gameserver.model.conditions.ConditionTargetNpcType; 
     100import com.l2jserver.gameserver.model.conditions.ConditionTargetPlayable; 
     101import com.l2jserver.gameserver.model.conditions.ConditionTargetRace; 
     102import com.l2jserver.gameserver.model.conditions.ConditionTargetRaceId; 
     103import com.l2jserver.gameserver.model.conditions.ConditionTargetUsesWeaponKind; 
     104import com.l2jserver.gameserver.model.conditions.ConditionUsingItemType; 
     105import com.l2jserver.gameserver.model.conditions.ConditionUsingSkill; 
     106import com.l2jserver.gameserver.model.conditions.ConditionWithSkill; 
     107import com.l2jserver.gameserver.model.effects.AbnormalEffect; 
     108import com.l2jserver.gameserver.model.effects.EffectTemplate; 
     109import com.l2jserver.gameserver.model.items.L2Item; 
     110import com.l2jserver.gameserver.model.items.type.L2ArmorType; 
     111import com.l2jserver.gameserver.model.items.type.L2WeaponType; 
     112import com.l2jserver.gameserver.model.skills.L2Skill; 
     113import com.l2jserver.gameserver.model.skills.L2SkillType; 
     114import com.l2jserver.gameserver.model.skills.funcs.FuncTemplate; 
     115import com.l2jserver.gameserver.model.skills.funcs.Lambda; 
     116import com.l2jserver.gameserver.model.skills.funcs.LambdaCalc; 
     117import com.l2jserver.gameserver.model.skills.funcs.LambdaConst; 
     118import com.l2jserver.gameserver.model.skills.funcs.LambdaStats; 
     119import com.l2jserver.gameserver.model.stats.Env; 
     120import com.l2jserver.gameserver.model.stats.Stats; 
    118121 
    119122/** 
    120123 * @author mkizub 
    121124 */ 
    122 abstract class DocumentBase 
     125public abstract class DocumentBase 
    123126{ 
    124         static Logger _log = Logger.getLogger(DocumentBase.class.getName()); 
     127        protected static Logger _log = Logger.getLogger(DocumentBase.class.getName()); 
    125128         
    126129        private final File _file; 
    127130        protected Map<String, String[]> _tables; 
    128131         
    129         DocumentBase(File pFile) 
     132        protected DocumentBase(File pFile) 
    130133        { 
    131134                _file = pFile; 
    … …  
    133136        } 
    134137         
    135         Document parse() 
     138        public Document parse() 
    136139        { 
    137140                Document doc; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/engines/DocumentEngine.java

    r5112 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills; 
     15package com.l2jserver.gameserver.engines; 
    1616 
    1717import gnu.trove.map.hash.TIntObjectHashMap; 
    … …  
    2525import com.l2jserver.Config; 
    2626import com.l2jserver.gameserver.datatables.SkillTable; 
    27 import com.l2jserver.gameserver.model.L2Skill; 
    28 import com.l2jserver.gameserver.model.item.L2Item; 
     27import com.l2jserver.gameserver.engines.items.DocumentItem; 
     28import com.l2jserver.gameserver.engines.skills.DocumentSkill; 
     29import com.l2jserver.gameserver.model.items.L2Item; 
     30import com.l2jserver.gameserver.model.skills.L2Skill; 
    2931import com.l2jserver.util.file.filter.XMLFilter; 
    3032 
    … …  
    3234 * @author mkizub 
    3335 */ 
    34 public class SkillsEngine 
     36public class DocumentEngine 
    3537{ 
    36         private static final Logger _log = Logger.getLogger(SkillsEngine.class.getName()); 
     38        private static final Logger _log = Logger.getLogger(DocumentEngine.class.getName()); 
    3739         
    3840        private final List<File> _itemFiles = new FastList<File>(); 
    3941        private final List<File> _skillFiles = new FastList<File>(); 
    4042         
    41         public static SkillsEngine getInstance() 
     43        public static DocumentEngine getInstance() 
    4244        { 
    4345                return SingletonHolder._instance; 
    4446        } 
    4547         
    46         private SkillsEngine() 
     48        private DocumentEngine() 
    4749        { 
    4850                hashFiles("data/stats/items", _itemFiles); 
    … …  
    119121        private static class SingletonHolder 
    120122        { 
    121                 protected static final SkillsEngine _instance = new SkillsEngine(); 
     123                protected static final DocumentEngine _instance = new DocumentEngine(); 
    122124        } 
    123125} 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/engines/items/DocumentItem.java

    r5112 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills; 
     15package com.l2jserver.gameserver.engines.items; 
    1616 
    1717import java.io.File; 
    … …  
    2626import org.w3c.dom.Node; 
    2727 
    28 import com.l2jserver.gameserver.Item; 
     28import com.l2jserver.gameserver.engines.DocumentBase; 
    2929import com.l2jserver.gameserver.model.StatsSet; 
    30 import com.l2jserver.gameserver.model.item.L2Item; 
    31 import com.l2jserver.gameserver.skills.conditions.Condition; 
     30import com.l2jserver.gameserver.model.conditions.Condition; 
     31import com.l2jserver.gameserver.model.items.L2Item; 
    3232 
    3333/** 
    3434 * @author mkizub, JIV 
    3535 */ 
    36 final class DocumentItem extends DocumentBase 
     36public final class DocumentItem extends DocumentBase 
    3737{ 
    3838        private Item _currentItem = null; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/engines/items/Item.java

    r5112 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver; 
     15package com.l2jserver.gameserver.engines.items; 
    1616 
    1717import com.l2jserver.gameserver.model.StatsSet; 
    18 import com.l2jserver.gameserver.model.item.L2Item; 
     18import com.l2jserver.gameserver.model.items.L2Item; 
    1919 
    2020/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/engines/skills/DocumentSkill.java

    r5112 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills; 
     15package com.l2jserver.gameserver.engines.skills; 
    1616 
    1717import java.io.File; 
    … …  
    2626 
    2727import com.l2jserver.gameserver.datatables.EnchantGroupsTable; 
    28 import com.l2jserver.gameserver.model.L2Skill; 
     28import com.l2jserver.gameserver.engines.DocumentBase; 
    2929import com.l2jserver.gameserver.model.StatsSet; 
    30 import com.l2jserver.gameserver.skills.conditions.Condition; 
    31 import com.l2jserver.gameserver.templates.skills.L2SkillType; 
     30import com.l2jserver.gameserver.model.conditions.Condition; 
     31import com.l2jserver.gameserver.model.skills.L2Skill; 
     32import com.l2jserver.gameserver.model.skills.L2SkillType; 
    3233 
    3334/** 
    3435 * @author mkizub 
    3536 */ 
    36 class DocumentSkill extends DocumentBase 
     37public class DocumentSkill extends DocumentBase 
    3738{ 
    3839        public static class Skill 
    … …  
    5758        private List<L2Skill> _skillsInFile  = new FastList<L2Skill>(); 
    5859         
    59         DocumentSkill(File file) 
     60        public DocumentSkill(File file) 
    6061        { 
    6162                super(file); 
    … …  
    7374        } 
    7475         
    75         protected List<L2Skill> getSkills() 
     76        public List<L2Skill> getSkills() 
    7677        { 
    7778                return _skillsInFile; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/handler/EffectHandler.java

    r5080 r5146  
    2121import javolution.util.FastMap; 
    2222 
    23 import com.l2jserver.gameserver.model.L2Effect; 
     23import com.l2jserver.gameserver.model.effects.L2Effect; 
    2424import com.l2jserver.gameserver.scripting.L2ScriptEngineManager; 
    2525 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/handler/IItemHandler.java

    r5083 r5146  
    1818 
    1919import com.l2jserver.gameserver.model.actor.L2Playable; 
    20 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     20import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    2121 
    2222 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/handler/ISkillHandler.java

    r4921 r5146  
    1818 
    1919import com.l2jserver.gameserver.model.L2Object; 
    20 import com.l2jserver.gameserver.model.L2Skill; 
    2120import com.l2jserver.gameserver.model.actor.L2Character; 
    22 import com.l2jserver.gameserver.templates.skills.L2SkillType; 
     21import com.l2jserver.gameserver.model.skills.L2Skill; 
     22import com.l2jserver.gameserver.model.skills.L2SkillType; 
    2323 
    2424 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/handler/ITargetTypeHandler.java

    r4975 r5146  
    1616 
    1717import com.l2jserver.gameserver.model.L2Object; 
    18 import com.l2jserver.gameserver.model.L2Skill; 
    1918import com.l2jserver.gameserver.model.actor.L2Character; 
    20 import com.l2jserver.gameserver.templates.skills.L2TargetType; 
     19import com.l2jserver.gameserver.model.skills.L2Skill; 
     20import com.l2jserver.gameserver.model.skills.targets.L2TargetType; 
    2121 
    2222/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/handler/ItemHandler.java

    r5083 r5146  
    1717import gnu.trove.map.hash.TIntObjectHashMap; 
    1818 
    19 import com.l2jserver.gameserver.model.item.L2EtcItem; 
     19import com.l2jserver.gameserver.model.items.L2EtcItem; 
    2020 
    2121/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/handler/SkillHandler.java

    r5080 r5146  
    1717import gnu.trove.map.hash.TIntObjectHashMap; 
    1818 
    19 import com.l2jserver.gameserver.templates.skills.L2SkillType; 
     19import com.l2jserver.gameserver.model.skills.L2SkillType; 
    2020 
    2121 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/handler/TargetHandler.java

    r5080 r5146  
    1919import javolution.util.FastMap; 
    2020 
    21 import com.l2jserver.gameserver.templates.skills.L2TargetType; 
     21import com.l2jserver.gameserver.model.skills.targets.L2TargetType; 
    2222 
    2323/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/AirShipManager.java

    r5083 r5146  
    3131import com.l2jserver.gameserver.model.actor.instance.L2ControllableAirShipInstance; 
    3232import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     33import com.l2jserver.gameserver.model.actor.templates.L2CharTemplate; 
    3334import com.l2jserver.gameserver.network.serverpackets.ExAirShipTeleportList; 
    34 import com.l2jserver.gameserver.templates.chars.L2CharTemplate; 
    3535 
    3636 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/BoatManager.java

    r5083 r5146  
    2828import com.l2jserver.gameserver.model.actor.instance.L2BoatInstance; 
    2929import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     30import com.l2jserver.gameserver.model.actor.templates.L2CharTemplate; 
    3031import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket; 
    31 import com.l2jserver.gameserver.templates.chars.L2CharTemplate; 
    3232 
    3333public class BoatManager 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/CastleManager.java

    r5083 r5146  
    3232import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    3333import com.l2jserver.gameserver.model.entity.Castle; 
    34 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     34import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    3535 
    3636public class CastleManager implements InstanceListManager 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/CursedWeaponsManager.java

    r5083 r5146  
    4747import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    4848import com.l2jserver.gameserver.model.actor.instance.L2RiftInvaderInstance; 
    49 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     49import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    5050import com.l2jserver.gameserver.network.SystemMessageId; 
    5151import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/DimensionalRiftManager.java

    r5083 r5146  
    4242import com.l2jserver.gameserver.model.actor.L2Npc; 
    4343import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     44import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    4445import com.l2jserver.gameserver.model.entity.DimensionalRift; 
    45 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     46import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    4647import com.l2jserver.gameserver.model.quest.Quest; 
    4748import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage; 
    48 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    4949import com.l2jserver.gameserver.util.Util; 
    5050import com.l2jserver.util.Rnd; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/DuelManager.java

    r4921 r5146  
    1919import javolution.util.FastList; 
    2020 
    21 import com.l2jserver.gameserver.model.L2Effect; 
    2221import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     22import com.l2jserver.gameserver.model.effects.L2Effect; 
    2323import com.l2jserver.gameserver.model.entity.Duel; 
    2424import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/FortSiegeGuardManager.java

    r4440 r5146  
    2828import com.l2jserver.gameserver.model.L2Spawn; 
    2929import com.l2jserver.gameserver.model.actor.instance.L2FortBallistaInstance; 
     30import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    3031import com.l2jserver.gameserver.model.entity.Fort; 
    31 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    3232 
    3333public class FortSiegeGuardManager 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/FortSiegeManager.java

    r5084 r5146  
    4141import com.l2jserver.gameserver.model.entity.Fort; 
    4242import com.l2jserver.gameserver.model.entity.FortSiege; 
    43 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     43import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    4444import com.l2jserver.gameserver.network.SystemMessageId; 
    4545import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/FourSepulchersManager.java

    r5093 r5146  
    4343import com.l2jserver.gameserver.model.actor.instance.L2SepulcherMonsterInstance; 
    4444import com.l2jserver.gameserver.model.actor.instance.L2SepulcherNpcInstance; 
    45 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     45import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
     46import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    4647import com.l2jserver.gameserver.model.quest.QuestState; 
    4748import com.l2jserver.gameserver.network.NpcStringId; 
    4849import com.l2jserver.gameserver.network.SystemMessageId; 
    4950import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage; 
    50 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    5151import com.l2jserver.gameserver.util.Util; 
    5252import com.l2jserver.util.Rnd; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/HellboundManager.java

    r5140 r5146  
    3131import com.l2jserver.gameserver.model.L2Spawn; 
    3232import com.l2jserver.gameserver.model.actor.L2Npc; 
    33 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
     33import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    3434import com.l2jserver.util.Rnd; 
    3535 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/ItemsOnGroundManager.java

    r5083 r5146  
    3030import com.l2jserver.gameserver.ThreadPoolManager; 
    3131import com.l2jserver.gameserver.model.L2World; 
    32 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    33 import com.l2jserver.gameserver.model.item.type.L2EtcItemType; 
     32import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
     33import com.l2jserver.gameserver.model.items.type.L2EtcItemType; 
    3434 
    3535/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/MercTicketManager.java

    r5083 r5146  
    3232import com.l2jserver.gameserver.model.actor.instance.L2DefenderInstance; 
    3333import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     34import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    3435import com.l2jserver.gameserver.model.entity.Castle; 
    35 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    36 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
     36import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    3737 
    3838/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/RaidBossSpawnManager.java

    r5083 r5146  
    3535import com.l2jserver.gameserver.model.StatsSet; 
    3636import com.l2jserver.gameserver.model.actor.instance.L2RaidBossInstance; 
    37 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
     37import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    3838import com.l2jserver.util.Rnd; 
    3939 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/SiegeGuardManager.java

    r4921 r5146  
    2828import com.l2jserver.gameserver.model.L2Spawn; 
    2929import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     30import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    3031import com.l2jserver.gameserver.model.entity.Castle; 
    31 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    3232 
    3333public class SiegeGuardManager 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/SiegeManager.java

    r4972 r5146  
    3636import com.l2jserver.gameserver.model.L2Clan; 
    3737import com.l2jserver.gameserver.model.L2Object; 
    38 import com.l2jserver.gameserver.model.L2Skill; 
    3938import com.l2jserver.gameserver.model.Location; 
    4039import com.l2jserver.gameserver.model.actor.L2Character; 
    … …  
    4241import com.l2jserver.gameserver.model.entity.Castle; 
    4342import com.l2jserver.gameserver.model.entity.Siege; 
     43import com.l2jserver.gameserver.model.skills.L2Skill; 
    4444 
    4545public class SiegeManager 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/TerritoryWarManager.java

    r5134 r5146  
    4242import com.l2jserver.gameserver.model.L2Clan; 
    4343import com.l2jserver.gameserver.model.L2SiegeClan; 
    44 import com.l2jserver.gameserver.model.L2Skill; 
    4544import com.l2jserver.gameserver.model.L2SkillLearn; 
    4645import com.l2jserver.gameserver.model.L2Spawn; 
    … …  
    5251import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    5352import com.l2jserver.gameserver.model.actor.instance.L2SiegeFlagInstance; 
     53import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    5454import com.l2jserver.gameserver.model.entity.Castle; 
    5555import com.l2jserver.gameserver.model.entity.Fort; 
    5656import com.l2jserver.gameserver.model.entity.Siegable; 
    5757import com.l2jserver.gameserver.model.quest.Quest; 
     58import com.l2jserver.gameserver.model.skills.L2Skill; 
    5859import com.l2jserver.gameserver.network.SystemMessageId; 
    5960import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket; 
    6061import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    61 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    6262import com.l2jserver.gameserver.util.Util; 
    6363import com.l2jserver.util.L2Properties; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/ZoneManager.java

    r5083 r5146  
    4141import com.l2jserver.gameserver.model.L2WorldRegion; 
    4242import com.l2jserver.gameserver.model.actor.L2Character; 
    43 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     43import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    4444import com.l2jserver.gameserver.model.zone.L2ZoneRespawn; 
    4545import com.l2jserver.gameserver.model.zone.L2ZoneType; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/games/Lottery.java

    r5083 r5146  
    2727import com.l2jserver.gameserver.Announcements; 
    2828import com.l2jserver.gameserver.ThreadPoolManager; 
    29 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     29import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    3030import com.l2jserver.gameserver.network.SystemMessageId; 
    3131import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/AutoSpawnHandler.java

    r4981 r5146  
    3737import com.l2jserver.gameserver.instancemanager.MapRegionManager; 
    3838import com.l2jserver.gameserver.model.actor.L2Npc; 
    39 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
     39import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    4040import com.l2jserver.util.Rnd; 
    4141 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/ChanceCondition.java

    r5083 r5146  
    1919import java.util.logging.Logger; 
    2020 
     21import com.l2jserver.gameserver.model.skills.L2Skill; 
    2122import com.l2jserver.util.Rnd; 
    2223 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/ChanceSkillList.java

    r5080 r5146  
    2525import com.l2jserver.gameserver.model.actor.L2Character; 
    2626import com.l2jserver.gameserver.model.actor.L2Playable; 
     27import com.l2jserver.gameserver.model.effects.L2Effect; 
     28import com.l2jserver.gameserver.model.skills.L2Skill; 
     29import com.l2jserver.gameserver.model.skills.L2SkillType; 
     30import com.l2jserver.gameserver.model.skills.targets.L2TargetType; 
    2731import com.l2jserver.gameserver.network.serverpackets.MagicSkillLaunched; 
    2832import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse; 
    29 import com.l2jserver.gameserver.templates.skills.L2SkillType; 
    30 import com.l2jserver.gameserver.templates.skills.L2TargetType; 
    3133 
    3234/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/CharEffectList.java

    r4921 r5146  
    3131import com.l2jserver.gameserver.model.actor.L2Summon; 
    3232import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     33import com.l2jserver.gameserver.model.effects.L2Effect; 
     34import com.l2jserver.gameserver.model.effects.L2EffectType; 
    3335import com.l2jserver.gameserver.model.olympiad.OlympiadGameManager; 
    3436import com.l2jserver.gameserver.model.olympiad.OlympiadGameTask; 
     37import com.l2jserver.gameserver.model.skills.L2Skill; 
     38import com.l2jserver.gameserver.model.skills.L2SkillType; 
    3539import com.l2jserver.gameserver.network.SystemMessageId; 
    3640import com.l2jserver.gameserver.network.serverpackets.AbnormalStatusUpdate; 
    … …  
    3842import com.l2jserver.gameserver.network.serverpackets.PartySpelled; 
    3943import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    40 import com.l2jserver.gameserver.templates.skills.L2EffectType; 
    41 import com.l2jserver.gameserver.templates.skills.L2SkillType; 
    4244 
    4345public class CharEffectList 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/ClanWarehouse.java

    r5083 r5146  
    1717import com.l2jserver.Config; 
    1818import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    19 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance.ItemLocation; 
    2019import com.l2jserver.gameserver.model.itemcontainer.Warehouse; 
     20import com.l2jserver.gameserver.model.items.instance.L2ItemInstance.ItemLocation; 
    2121 
    2222public final class ClanWarehouse extends Warehouse 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/CombatFlag.java

    r5084 r5146  
    1818import com.l2jserver.gameserver.datatables.ItemTable; 
    1919import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    20 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     20import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    2121import com.l2jserver.gameserver.network.SystemMessageId; 
    2222import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/CursedWeapon.java

    r5083 r5146  
    3232import com.l2jserver.gameserver.model.actor.L2Character; 
    3333import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    34 import com.l2jserver.gameserver.model.item.L2Item; 
    35 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     34import com.l2jserver.gameserver.model.items.L2Item; 
     35import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
     36import com.l2jserver.gameserver.model.skills.L2Skill; 
    3637import com.l2jserver.gameserver.network.SystemMessageId; 
    3738import com.l2jserver.gameserver.network.serverpackets.Earthquake; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/Elementals.java

    r4972 r5146  
    1919import com.l2jserver.gameserver.model.actor.L2Character; 
    2020import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    21 import com.l2jserver.gameserver.skills.Stats; 
    22 import com.l2jserver.gameserver.skills.funcs.FuncAdd; 
    23 import com.l2jserver.gameserver.skills.funcs.LambdaConst; 
     21import com.l2jserver.gameserver.model.skills.funcs.FuncAdd; 
     22import com.l2jserver.gameserver.model.skills.funcs.LambdaConst; 
     23import com.l2jserver.gameserver.model.stats.Stats; 
    2424 
    2525public final class Elementals 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/EnchantItem.java

    r5087 r5146  
    1717import java.util.Arrays; 
    1818 
    19 import com.l2jserver.gameserver.model.item.L2Item; 
    20 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     19import com.l2jserver.gameserver.model.items.L2Item; 
     20import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    2121 
    2222/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/EnchantScroll.java

    r5087 r5146  
    1616 
    1717import com.l2jserver.Config; 
    18 import com.l2jserver.gameserver.model.item.L2Item; 
    19 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     18import com.l2jserver.gameserver.model.items.L2Item; 
     19import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    2020 
    2121 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/FusionSkill.java

    r4981 r5146  
    2323import com.l2jserver.gameserver.datatables.SkillTable; 
    2424import com.l2jserver.gameserver.model.actor.L2Character; 
     25import com.l2jserver.gameserver.model.effects.L2Effect; 
     26import com.l2jserver.gameserver.model.skills.L2Skill; 
    2527import com.l2jserver.gameserver.util.Util; 
    2628 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/ItemInfo.java

    r5083 r5146  
    1515package com.l2jserver.gameserver.model; 
    1616 
    17 import com.l2jserver.gameserver.model.item.L2Item; 
    18 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     17import com.l2jserver.gameserver.model.items.L2Item; 
     18import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    1919 
    2020/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2ArmorSet.java

    r5083 r5146  
    1515 
    1616import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    17 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    1817import com.l2jserver.gameserver.model.itemcontainer.Inventory; 
     18import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    1919 
    2020/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2Augmentation.java

    r4426 r5146  
    2222import com.l2jserver.gameserver.model.actor.L2Character; 
    2323import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     24import com.l2jserver.gameserver.model.skills.L2Skill; 
     25import com.l2jserver.gameserver.model.skills.funcs.FuncAdd; 
     26import com.l2jserver.gameserver.model.skills.funcs.LambdaConst; 
     27import com.l2jserver.gameserver.model.stats.Stats; 
    2428import com.l2jserver.gameserver.network.serverpackets.SkillCoolTime; 
    25 import com.l2jserver.gameserver.skills.Stats; 
    26 import com.l2jserver.gameserver.skills.funcs.FuncAdd; 
    27 import com.l2jserver.gameserver.skills.funcs.LambdaConst; 
    2829 
    2930/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2Clan.java

    r5093 r5146  
    4444import com.l2jserver.gameserver.model.actor.instance.L2PcInstance.TimeStamp; 
    4545import com.l2jserver.gameserver.model.itemcontainer.ItemContainer; 
     46import com.l2jserver.gameserver.model.skills.L2Skill; 
    4647import com.l2jserver.gameserver.network.SystemMessageId; 
    4748import com.l2jserver.gameserver.network.communityserver.CommunityServerThread; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2Fishing.java

    r5093 r5146  
    2121import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    2222import com.l2jserver.gameserver.model.actor.instance.L2PenaltyMonsterInstance; 
     23import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    2324import com.l2jserver.gameserver.network.SystemMessageId; 
    2425import com.l2jserver.gameserver.network.serverpackets.ExFishingHpRegen; 
    … …  
    2627import com.l2jserver.gameserver.network.serverpackets.PlaySound; 
    2728import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    28 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    2929import com.l2jserver.util.Rnd; 
    3030 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2GroupSpawn.java

    r5013 r5146  
    2222import com.l2jserver.gameserver.idfactory.IdFactory; 
    2323import com.l2jserver.gameserver.model.actor.L2Npc; 
    24 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
     24import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    2525import com.l2jserver.util.Rnd; 
    2626 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2Manor.java

    r5145 r5146  
    2828import com.l2jserver.Config; 
    2929import com.l2jserver.gameserver.datatables.ItemTable; 
    30 import com.l2jserver.gameserver.model.item.L2Item; 
     30import com.l2jserver.gameserver.model.items.L2Item; 
    3131import com.l2jserver.gameserver.util.L2TIntObjectHashMap; 
    3232 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2NpcAIData.java

    r5134 r5146  
    1515package com.l2jserver.gameserver.model; 
    1616 
    17 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate.AIType; 
     17import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate.AIType; 
    1818 
    1919/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2Object.java

    r5131 r5146  
    8484                L2EffectPointInstance(L2Npc), 
    8585                // Summons, Pets, Decoys and Traps 
    86                 L2SummonInstance(L2Summon), 
    87                 L2SiegeSummonInstance(L2SummonInstance), 
    88                 L2MerchantSummonInstance(L2SummonInstance), 
     86                L2ServitorInstance(L2Summon), 
     87                L2SiegeSummonInstance(L2ServitorInstance), 
     88                L2MerchantSummonInstance(L2ServitorInstance), 
    8989                L2PetInstance(L2Summon), 
    9090                L2BabyPetInstance(L2PetInstance), 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2Party.java

    r5093 r5146  
    3636import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    3737import com.l2jserver.gameserver.model.actor.instance.L2PetInstance; 
    38 import com.l2jserver.gameserver.model.actor.instance.L2SummonInstance; 
     38import com.l2jserver.gameserver.model.actor.instance.L2ServitorInstance; 
    3939import com.l2jserver.gameserver.model.entity.DimensionalRift; 
    40 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    4140import com.l2jserver.gameserver.model.itemcontainer.PcInventory; 
     41import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
     42import com.l2jserver.gameserver.model.skills.L2Skill; 
     43import com.l2jserver.gameserver.model.stats.Stats; 
    4244import com.l2jserver.gameserver.network.SystemMessageId; 
    4345import com.l2jserver.gameserver.network.serverpackets.CreatureSay; 
    … …  
    5557import com.l2jserver.gameserver.network.serverpackets.PartySmallWindowDeleteAll; 
    5658import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    57 import com.l2jserver.gameserver.skills.Stats; 
    5859import com.l2jserver.gameserver.util.Util; 
    5960import com.l2jserver.util.Rnd; 
    … …  
    737738         * 
    738739         * <B><U> Actions</U> :</B><BR><BR> 
    739          * <li>Get the L2PcInstance owner of the L2SummonInstance (if necessary) </li> 
     740         * <li>Get the L2PcInstance owner of the L2ServitorInstance (if necessary) </li> 
    740741         * <li>Calculate the Experience and SP reward distribution rate </li> 
    741742         * <li>Add Experience and SP to the L2PcInstance </li><BR><BR> 
    … …  
    753754        public void distributeXpAndSp(long xpReward, int spReward, List<L2Playable> rewardedMembers, int topLvl, int partyDmg, L2Attackable target) 
    754755        { 
    755                 L2SummonInstance summon = null; 
     756                L2ServitorInstance summon = null; 
    756757                List<L2Playable> validMembers = getValidMembers(rewardedMembers, topLvl); 
    757758                 
    … …  
    770771                final boolean useVitalityRate = target.useVitalityRate(); 
    771772                 
    772                 // Go through the L2PcInstances and L2PetInstances (not L2SummonInstances) that must be rewarded 
     773                // Go through the L2PcInstances and L2PetInstances (not L2ServitorInstances) that must be rewarded 
    773774                synchronized(rewardedMembers) 
    774775                { 
    … …  
    779780                                penalty = 0; 
    780781                                 
    781                                 // The L2SummonInstance penalty 
    782                                 if (member.getPet() instanceof L2SummonInstance) 
    783                                 { 
    784                                         summon     = (L2SummonInstance)member.getPet(); 
     782                                // The L2ServitorInstance penalty 
     783                                if (member.getPet() instanceof L2ServitorInstance) 
     784                                { 
     785                                        summon     = (L2ServitorInstance)member.getPet(); 
    785786                                        penalty    = summon.getExpPenalty(); 
    786787                                } 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2Spawn.java

    r5060 r5146  
    3131import com.l2jserver.gameserver.model.actor.L2Npc; 
    3232import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance; 
    33 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
     33import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    3434import com.l2jserver.util.Rnd; 
    3535 
    … …  
    160160                 
    161161                // Create the generic constructor of L2NpcInstance managed by this L2Spawn 
    162                 Class<?>[] parameters = {int.class, Class.forName("com.l2jserver.gameserver.templates.chars.L2NpcTemplate")}; 
     162                Class<?>[] parameters = {int.class, Class.forName("com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate")}; 
    163163                _constructor = Class.forName("com.l2jserver.gameserver.model.actor.instance." + _template.getType() + "Instance").getConstructor(parameters); 
    164164        } 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2TradeList.java

    r5083 r5146  
    3131import com.l2jserver.gameserver.ThreadPoolManager; 
    3232import com.l2jserver.gameserver.datatables.ItemTable; 
    33 import com.l2jserver.gameserver.model.item.L2Item; 
     33import com.l2jserver.gameserver.model.items.L2Item; 
    3434 
    3535/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2WorldRegion.java

    r5111 r5146  
    3333import com.l2jserver.gameserver.model.actor.L2Playable; 
    3434import com.l2jserver.gameserver.model.actor.L2Vehicle; 
     35import com.l2jserver.gameserver.model.skills.L2Skill; 
    3536import com.l2jserver.gameserver.model.zone.L2ZoneType; 
    3637import com.l2jserver.gameserver.model.zone.type.L2PeaceZone; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/MobGroup.java

    r4417 r5146  
    2525import com.l2jserver.gameserver.model.actor.instance.L2ControllableMobInstance; 
    2626import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    27 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
     27import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    2828import com.l2jserver.util.Rnd; 
    2929 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/ShortCuts.java

    r5083 r5146  
    2525import com.l2jserver.L2DatabaseFactory; 
    2626import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    27 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    28 import com.l2jserver.gameserver.model.item.type.L2EtcItemType; 
     27import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
     28import com.l2jserver.gameserver.model.items.type.L2EtcItemType; 
    2929import com.l2jserver.gameserver.network.serverpackets.ExAutoSoulShot; 
    3030import com.l2jserver.gameserver.network.serverpackets.ShortCutInit; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/TempItem.java

    r5083 r5146  
    1515package com.l2jserver.gameserver.model; 
    1616 
    17 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     17import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    1818 
    1919/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/TerritoryWard.java

    r5093 r5146  
    2020import com.l2jserver.gameserver.model.actor.L2Npc; 
    2121import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    22 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     22import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    2323import com.l2jserver.gameserver.network.SystemMessageId; 
    2424import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/TradeItem.java

    r5083 r5146  
    1515package com.l2jserver.gameserver.model; 
    1616 
    17 import com.l2jserver.gameserver.model.item.L2Item; 
    18 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     17import com.l2jserver.gameserver.model.items.L2Item; 
     18import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    1919 
    2020public class TradeItem 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/TradeList.java

    r5093 r5146  
    2626import com.l2jserver.gameserver.datatables.ItemTable; 
    2727import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    28 import com.l2jserver.gameserver.model.item.L2Item; 
    29 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    3028import com.l2jserver.gameserver.model.itemcontainer.PcInventory; 
     29import com.l2jserver.gameserver.model.items.L2Item; 
     30import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    3131import com.l2jserver.gameserver.network.SystemMessageId; 
    3232import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Attackable.java

    r5112 r5146  
    4444import com.l2jserver.gameserver.model.L2Object; 
    4545import com.l2jserver.gameserver.model.L2Party; 
    46 import com.l2jserver.gameserver.model.L2Skill; 
    4746import com.l2jserver.gameserver.model.actor.instance.L2GrandBossInstance; 
    4847import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance; 
    4948import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    5049import com.l2jserver.gameserver.model.actor.instance.L2PetInstance; 
    51 import com.l2jserver.gameserver.model.actor.instance.L2SummonInstance; 
     50import com.l2jserver.gameserver.model.actor.instance.L2ServitorInstance; 
    5251import com.l2jserver.gameserver.model.actor.knownlist.AttackableKnownList; 
    5352import com.l2jserver.gameserver.model.actor.status.AttackableStatus; 
    54 import com.l2jserver.gameserver.model.item.L2Item; 
    55 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    56 import com.l2jserver.gameserver.model.item.type.L2EtcItemType; 
     53import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    5754import com.l2jserver.gameserver.model.itemcontainer.PcInventory; 
     55import com.l2jserver.gameserver.model.items.L2Item; 
     56import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
     57import com.l2jserver.gameserver.model.items.type.L2EtcItemType; 
    5858import com.l2jserver.gameserver.model.quest.Quest; 
     59import com.l2jserver.gameserver.model.skills.L2Skill; 
     60import com.l2jserver.gameserver.model.stats.Stats; 
    5961import com.l2jserver.gameserver.network.SystemMessageId; 
    6062import com.l2jserver.gameserver.network.clientpackets.Say2; 
    6163import com.l2jserver.gameserver.network.serverpackets.CreatureSay; 
    6264import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    63 import com.l2jserver.gameserver.skills.Stats; 
    6465import com.l2jserver.gameserver.taskmanager.DecayTaskManager; 
    65 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    6666import com.l2jserver.gameserver.util.L2TIntObjectHashMap; 
    6767import com.l2jserver.gameserver.util.Util; 
    … …  
    582582         * 
    583583         * Actions: 
    584          * Get the L2PcInstance owner of the L2SummonInstance (if necessary) and L2Party in progress 
     584         * Get the L2PcInstance owner of the L2ServitorInstance (if necessary) and L2Party in progress 
    585585         * Calculate the Experience and SP rewards in function of the level difference 
    586586         * Add Exp and SP rewards to L2PcInstance (including Summon penalty) and to Party members in the known area of the last attacker 
    … …  
    623623                                if (damage > 1) 
    624624                                { 
    625                                         if ((attacker instanceof L2SummonInstance) || ((attacker instanceof L2PetInstance) && ((L2PetInstance) attacker).getPetLevelData().getOwnerExpTaken() > 0)) 
     625                                        if ((attacker instanceof L2ServitorInstance) || ((attacker instanceof L2PetInstance) && ((L2PetInstance) attacker).getPetLevelData().getOwnerExpTaken() > 0)) 
    626626                                                ddealer = ((L2Summon) attacker).getOwner(); 
    627627                                        else 
    … …  
    695695                                                return; 
    696696                                         
    697                                         // If this attacker is a L2PcInstance with a summoned L2SummonInstance, get Exp Penalty applied for the current summoned L2SummonInstance 
    698                                         if (attacker instanceof L2PcInstance && ((L2PcInstance) attacker).getPet() instanceof L2SummonInstance) 
    699                                                 penalty = ((L2SummonInstance) ((L2PcInstance) attacker).getPet()).getExpPenalty(); 
     697                                        // If this attacker is a L2PcInstance with a summoned L2ServitorInstance, get Exp Penalty applied for the current summoned L2SummonInstance 
     698                                        if (attacker instanceof L2PcInstance && ((L2PcInstance) attacker).getPet() instanceof L2ServitorInstance) 
     699                                                penalty = ((L2ServitorInstance) ((L2PcInstance) attacker).getPet()).getExpPenalty(); 
    700700                                         
    701701                                        // We must avoid "over damage", if any 
    … …  
    709709                                                if (attacker.getKnownList().knowsObject(this)) 
    710710                                                { 
    711                                                         // Calculate the difference of level between this attacker (L2PcInstance or L2SummonInstance owner) and the L2Attackable 
     711                                                        // Calculate the difference of level between this attacker (L2PcInstance or L2ServitorInstance owner) and the L2Attackable 
    712712                                                        // mob = 24, atk = 10, diff = -14 (full xp) 
    713713                                                        // mob = 24, atk = 28, diff = 4 (some xp) 
    … …  
    20592059         
    20602060        /** 
    2061          * Calculate the Experience and SP to distribute to attacker (L2PcInstance, L2SummonInstance or L2Party) of the L2Attackable. 
    2062          * 
    2063          * @param diff The difference of level between attacker (L2PcInstance, L2SummonInstance or L2Party) and the L2Attackable 
    2064          * @param damage The damages given by the attacker (L2PcInstance, L2SummonInstance or L2Party) 
     2061         * Calculate the Experience and SP to distribute to attacker (L2PcInstance, L2ServitorInstance or L2Party) of the L2Attackable. 
     2062         * 
     2063         * @param diff The difference of level between attacker (L2PcInstance, L2ServitorInstance or L2Party) and the L2Attackable 
     2064         * @param damage The damages given by the attacker (L2PcInstance, L2ServitorInstance or L2Party) 
    20652065         * @return  
    20662066         */ 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Character.java

    r5101 r5146  
    5353import com.l2jserver.gameserver.model.IChanceSkillTrigger; 
    5454import com.l2jserver.gameserver.model.L2CharPosition; 
    55 import com.l2jserver.gameserver.model.L2Effect; 
    5655import com.l2jserver.gameserver.model.L2Object; 
    5756import com.l2jserver.gameserver.model.L2Party; 
    58 import com.l2jserver.gameserver.model.L2Skill; 
    5957import com.l2jserver.gameserver.model.L2World; 
    6058import com.l2jserver.gameserver.model.L2WorldRegion; 
    … …  
    7068import com.l2jserver.gameserver.model.actor.stat.CharStat; 
    7169import com.l2jserver.gameserver.model.actor.status.CharStatus; 
     70import com.l2jserver.gameserver.model.actor.templates.L2CharTemplate; 
     71import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
     72import com.l2jserver.gameserver.model.effects.AbnormalEffect; 
     73import com.l2jserver.gameserver.model.effects.L2Effect; 
     74import com.l2jserver.gameserver.model.effects.L2EffectType; 
    7275import com.l2jserver.gameserver.model.entity.Instance; 
    73 import com.l2jserver.gameserver.model.item.L2Item; 
    74 import com.l2jserver.gameserver.model.item.L2Weapon; 
    75 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    76 import com.l2jserver.gameserver.model.item.type.L2WeaponType; 
     76import com.l2jserver.gameserver.model.holders.SkillHolder; 
    7777import com.l2jserver.gameserver.model.itemcontainer.Inventory; 
     78import com.l2jserver.gameserver.model.items.L2Item; 
     79import com.l2jserver.gameserver.model.items.L2Weapon; 
     80import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
     81import com.l2jserver.gameserver.model.items.type.L2WeaponType; 
    7882import com.l2jserver.gameserver.model.quest.Quest; 
     83import com.l2jserver.gameserver.model.skills.L2Skill; 
     84import com.l2jserver.gameserver.model.skills.L2SkillType; 
     85import com.l2jserver.gameserver.model.skills.funcs.Func; 
     86import com.l2jserver.gameserver.model.skills.l2skills.L2SkillAgathion; 
     87import com.l2jserver.gameserver.model.skills.l2skills.L2SkillMount; 
     88import com.l2jserver.gameserver.model.skills.l2skills.L2SkillSummon; 
     89import com.l2jserver.gameserver.model.skills.targets.L2TargetType; 
     90import com.l2jserver.gameserver.model.stats.Calculator; 
     91import com.l2jserver.gameserver.model.stats.Formulas; 
     92import com.l2jserver.gameserver.model.stats.Stats; 
    7993import com.l2jserver.gameserver.network.SystemMessageId; 
    8094import com.l2jserver.gameserver.network.serverpackets.AbstractNpcInfo; 
    … …  
    100114import com.l2jserver.gameserver.pathfinding.AbstractNodeLoc; 
    101115import com.l2jserver.gameserver.pathfinding.PathFinding; 
    102 import com.l2jserver.gameserver.skills.AbnormalEffect; 
    103 import com.l2jserver.gameserver.skills.Calculator; 
    104 import com.l2jserver.gameserver.skills.Formulas; 
    105 import com.l2jserver.gameserver.skills.SkillHolder; 
    106 import com.l2jserver.gameserver.skills.Stats; 
    107 import com.l2jserver.gameserver.skills.funcs.Func; 
    108 import com.l2jserver.gameserver.skills.l2skills.L2SkillAgathion; 
    109 import com.l2jserver.gameserver.skills.l2skills.L2SkillMount; 
    110 import com.l2jserver.gameserver.skills.l2skills.L2SkillSummon; 
    111116import com.l2jserver.gameserver.taskmanager.AttackStanceTaskManager; 
    112 import com.l2jserver.gameserver.templates.chars.L2CharTemplate; 
    113 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    114 import com.l2jserver.gameserver.templates.skills.L2EffectType; 
    115 import com.l2jserver.gameserver.templates.skills.L2SkillType; 
    116 import com.l2jserver.gameserver.templates.skills.L2TargetType; 
    117117import com.l2jserver.gameserver.util.L2TIntObjectHashMap; 
    118118import com.l2jserver.gameserver.util.Point3D; 
    … …  
    74357435         * <B><U> Overridden in </U> :</B><BR><BR> 
    74367436         * <li> L2PcInstance 
    7437          * <li> L2SummonInstance 
     7437         * <li> L2ServitorInstance 
    74387438         * <li> L2PetInstance</li><BR><BR> 
    74397439         * @param target  

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Decoy.java

    r5083 r5146  
    1919 
    2020import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    21 import com.l2jserver.gameserver.model.item.L2Weapon; 
    22 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     21import com.l2jserver.gameserver.model.actor.templates.L2CharTemplate; 
     22import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
     23import com.l2jserver.gameserver.model.items.L2Weapon; 
     24import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    2325import com.l2jserver.gameserver.network.SystemMessageId; 
    2426import com.l2jserver.gameserver.network.serverpackets.CharInfo; 
    2527import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket; 
    2628import com.l2jserver.gameserver.taskmanager.DecayTaskManager; 
    27 import com.l2jserver.gameserver.templates.chars.L2CharTemplate; 
    28 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    2929 
    3030 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Npc.java

    r5134 r5146  
    3737import com.l2jserver.gameserver.model.L2NpcAIData; 
    3838import com.l2jserver.gameserver.model.L2Object; 
    39 import com.l2jserver.gameserver.model.L2Skill; 
    4039import com.l2jserver.gameserver.model.L2Spawn; 
    4140import com.l2jserver.gameserver.model.L2World; 
    … …  
    5554import com.l2jserver.gameserver.model.actor.stat.NpcStat; 
    5655import com.l2jserver.gameserver.model.actor.status.NpcStatus; 
     56import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
     57import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate.AIType; 
    5758import com.l2jserver.gameserver.model.entity.Castle; 
    5859import com.l2jserver.gameserver.model.entity.Fort; 
    5960import com.l2jserver.gameserver.model.entity.clanhall.SiegableHall; 
    60 import com.l2jserver.gameserver.model.item.L2Item; 
    61 import com.l2jserver.gameserver.model.item.L2Weapon; 
    62 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     61import com.l2jserver.gameserver.model.items.L2Item; 
     62import com.l2jserver.gameserver.model.items.L2Weapon; 
     63import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    6364import com.l2jserver.gameserver.model.olympiad.Olympiad; 
    6465import com.l2jserver.gameserver.model.quest.Quest; 
     66import com.l2jserver.gameserver.model.skills.L2Skill; 
     67import com.l2jserver.gameserver.model.skills.targets.L2TargetType; 
    6568import com.l2jserver.gameserver.model.zone.type.L2TownZone; 
    6669import com.l2jserver.gameserver.network.SystemMessageId; 
    … …  
    7376import com.l2jserver.gameserver.network.serverpackets.SocialAction; 
    7477import com.l2jserver.gameserver.taskmanager.DecayTaskManager; 
    75 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    76 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate.AIType; 
    77 import com.l2jserver.gameserver.templates.skills.L2TargetType; 
    7878import com.l2jserver.gameserver.util.Broadcast; 
    7979import com.l2jserver.util.Rnd; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Playable.java

    r4921 r5146  
    1717import com.l2jserver.gameserver.ai.CtrlEvent; 
    1818import com.l2jserver.gameserver.model.CharEffectList; 
    19 import com.l2jserver.gameserver.model.L2Effect; 
    20 import com.l2jserver.gameserver.model.L2Skill; 
    2119import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    2220import com.l2jserver.gameserver.model.actor.knownlist.PlayableKnownList; 
    2321import com.l2jserver.gameserver.model.actor.stat.PlayableStat; 
    2422import com.l2jserver.gameserver.model.actor.status.PlayableStatus; 
     23import com.l2jserver.gameserver.model.actor.templates.L2CharTemplate; 
     24import com.l2jserver.gameserver.model.effects.L2Effect; 
     25import com.l2jserver.gameserver.model.effects.L2EffectType; 
    2526import com.l2jserver.gameserver.model.quest.QuestState; 
    26 import com.l2jserver.gameserver.templates.chars.L2CharTemplate; 
    27 import com.l2jserver.gameserver.templates.skills.L2EffectType; 
     27import com.l2jserver.gameserver.model.skills.L2Skill; 
    2828 
    2929/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Summon.java

    r5134 r5146  
    2626import com.l2jserver.gameserver.model.L2Object; 
    2727import com.l2jserver.gameserver.model.L2Party; 
    28 import com.l2jserver.gameserver.model.L2Skill; 
    2928import com.l2jserver.gameserver.model.L2WorldRegion; 
    3029import com.l2jserver.gameserver.model.actor.L2Attackable.AggroInfo; 
    … …  
    3433import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    3534import com.l2jserver.gameserver.model.actor.instance.L2PetInstance; 
    36 import com.l2jserver.gameserver.model.actor.instance.L2SummonInstance; 
     35import com.l2jserver.gameserver.model.actor.instance.L2ServitorInstance; 
    3736import com.l2jserver.gameserver.model.actor.knownlist.SummonKnownList; 
    3837import com.l2jserver.gameserver.model.actor.stat.SummonStat; 
    3938import com.l2jserver.gameserver.model.actor.status.SummonStatus; 
    40 import com.l2jserver.gameserver.model.item.L2EtcItem; 
    41 import com.l2jserver.gameserver.model.item.L2Weapon; 
    42 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     39import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    4340import com.l2jserver.gameserver.model.itemcontainer.PetInventory; 
     41import com.l2jserver.gameserver.model.items.L2EtcItem; 
     42import com.l2jserver.gameserver.model.items.L2Weapon; 
     43import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    4444import com.l2jserver.gameserver.model.olympiad.OlympiadGameManager; 
     45import com.l2jserver.gameserver.model.skills.L2Skill; 
     46import com.l2jserver.gameserver.model.skills.targets.L2TargetType; 
    4547import com.l2jserver.gameserver.network.SystemMessageId; 
    4648import com.l2jserver.gameserver.network.serverpackets.AbstractNpcInfo; 
    … …  
    5860import com.l2jserver.gameserver.network.serverpackets.TeleportToLocation; 
    5961import com.l2jserver.gameserver.taskmanager.DecayTaskManager; 
    60 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    61 import com.l2jserver.gameserver.templates.skills.L2TargetType; 
    6262 
    6363public abstract class L2Summon extends L2Playable 
    … …  
    753753                { 
    754754                        if (pcrit || mcrit) 
    755                                 if (this instanceof L2SummonInstance) 
     755                                if (this instanceof L2ServitorInstance) 
    756756                                        sendPacket(SystemMessageId.CRITICAL_HIT_BY_SUMMONED_MOB); 
    757757                                else 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Trap.java

    r5083 r5146  
    1919 
    2020import com.l2jserver.gameserver.ThreadPoolManager; 
    21 import com.l2jserver.gameserver.model.L2Skill; 
    2221import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    2322import com.l2jserver.gameserver.model.actor.knownlist.TrapKnownList; 
    24 import com.l2jserver.gameserver.model.item.L2Weapon; 
    25 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     23import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
     24import com.l2jserver.gameserver.model.items.L2Weapon; 
     25import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    2626import com.l2jserver.gameserver.model.quest.Quest; 
    2727import com.l2jserver.gameserver.model.quest.Quest.TrapAction; 
     28import com.l2jserver.gameserver.model.skills.L2Skill; 
    2829import com.l2jserver.gameserver.network.serverpackets.AbstractNpcInfo; 
    2930import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket; 
    3031import com.l2jserver.gameserver.network.serverpackets.SocialAction; 
    3132import com.l2jserver.gameserver.taskmanager.DecayTaskManager; 
    32 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    3333 
    3434/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Vehicle.java

    r5093 r5146  
    3636import com.l2jserver.gameserver.model.actor.knownlist.VehicleKnownList; 
    3737import com.l2jserver.gameserver.model.actor.stat.VehicleStat; 
    38 import com.l2jserver.gameserver.model.item.L2Weapon; 
    39 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     38import com.l2jserver.gameserver.model.actor.templates.L2CharTemplate; 
     39import com.l2jserver.gameserver.model.items.L2Weapon; 
     40import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    4041import com.l2jserver.gameserver.network.SystemMessageId; 
    4142import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate; 
    4243import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket; 
    43 import com.l2jserver.gameserver.templates.chars.L2CharTemplate; 
    4444import com.l2jserver.gameserver.util.Util; 
    4545 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2AdventurerInstance.java

    r4417 r5146  
    1515package com.l2jserver.gameserver.model.actor.instance; 
    1616 
    17 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
     17import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    1818 
    1919/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2AirShipInstance.java

    r4731 r5146  
    2020import com.l2jserver.gameserver.model.Location; 
    2121import com.l2jserver.gameserver.model.actor.L2Vehicle; 
     22import com.l2jserver.gameserver.model.actor.templates.L2CharTemplate; 
    2223import com.l2jserver.gameserver.network.serverpackets.ExAirShipInfo; 
    2324import com.l2jserver.gameserver.network.serverpackets.ExGetOffAirShip; 
    … …  
    2526import com.l2jserver.gameserver.network.serverpackets.ExMoveToLocationAirShip; 
    2627import com.l2jserver.gameserver.network.serverpackets.ExStopMoveAirShip; 
    27 import com.l2jserver.gameserver.templates.chars.L2CharTemplate; 
    2828import com.l2jserver.gameserver.util.Point3D; 
    2929 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2ArtefactInstance.java

    r4921 r5146  
    1515package com.l2jserver.gameserver.model.actor.instance; 
    1616 
    17 import com.l2jserver.gameserver.model.L2Skill; 
    1817import com.l2jserver.gameserver.model.actor.L2Character; 
    1918import com.l2jserver.gameserver.model.actor.L2Npc; 
     19import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
     20import com.l2jserver.gameserver.model.skills.L2Skill; 
    2021import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 
    21 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    2222 
    2323/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2AuctioneerInstance.java

    r5093 r5146  
    3131import com.l2jserver.gameserver.model.L2Clan; 
    3232import com.l2jserver.gameserver.model.actor.L2Npc; 
     33import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    3334import com.l2jserver.gameserver.model.entity.Auction; 
    3435import com.l2jserver.gameserver.model.entity.Auction.Bidder; 
    3536import com.l2jserver.gameserver.network.SystemMessageId; 
    3637import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage; 
    37 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    3838 
    3939public final class L2AuctioneerInstance extends L2Npc 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2BabyPetInstance.java

    r5083 r5146  
    2525import com.l2jserver.gameserver.datatables.PetDataTable; 
    2626import com.l2jserver.gameserver.datatables.SkillTable; 
    27 import com.l2jserver.gameserver.model.L2Effect; 
    2827import com.l2jserver.gameserver.model.L2PetData.L2PetSkillLearn; 
    29 import com.l2jserver.gameserver.model.L2Skill; 
    3028import com.l2jserver.gameserver.model.actor.L2Character; 
    31 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     29import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
     30import com.l2jserver.gameserver.model.effects.L2Effect; 
     31import com.l2jserver.gameserver.model.holders.SkillHolder; 
     32import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
     33import com.l2jserver.gameserver.model.skills.L2Skill; 
    3234import com.l2jserver.gameserver.network.SystemMessageId; 
    3335import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    34 import com.l2jserver.gameserver.skills.SkillHolder; 
    35 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    3636import com.l2jserver.util.Rnd; 
    3737 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2BirthdayCakeInstance.java

    r5131 r5146  
    2020import com.l2jserver.gameserver.datatables.SkillTable; 
    2121import com.l2jserver.gameserver.model.L2Party; 
    22 import com.l2jserver.gameserver.model.L2Skill; 
    2322import com.l2jserver.gameserver.model.actor.L2Character; 
    2423import com.l2jserver.gameserver.model.actor.L2Npc; 
    25 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
     24import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
     25import com.l2jserver.gameserver.model.skills.L2Skill; 
    2626 
    2727/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2BlockInstance.java

    r5098 r5146  
    1818import com.l2jserver.gameserver.instancemanager.HandysBlockCheckerManager.ArenaParticipantsHolder; 
    1919import com.l2jserver.gameserver.model.actor.L2Character; 
     20import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    2021import com.l2jserver.gameserver.model.entity.BlockCheckerEngine; 
    21 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     22import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    2223import com.l2jserver.gameserver.network.serverpackets.AbstractNpcInfo; 
    2324import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 
    … …  
    2728import com.l2jserver.gameserver.network.serverpackets.StatusUpdate; 
    2829import com.l2jserver.gameserver.network.serverpackets.ValidateLocation; 
    29 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    3030import com.l2jserver.util.Rnd; 
    3131 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2BoatInstance.java

    r4417 r5146  
    2121import com.l2jserver.gameserver.model.Location; 
    2222import com.l2jserver.gameserver.model.actor.L2Vehicle; 
     23import com.l2jserver.gameserver.model.actor.templates.L2CharTemplate; 
    2324import com.l2jserver.gameserver.network.serverpackets.VehicleDeparture; 
    2425import com.l2jserver.gameserver.network.serverpackets.VehicleInfo; 
    2526import com.l2jserver.gameserver.network.serverpackets.VehicleStarted; 
    26 import com.l2jserver.gameserver.templates.chars.L2CharTemplate; 
    2727 
    2828/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2CabaleBufferInstance.java

    r4798 r5146  
    2323import com.l2jserver.gameserver.datatables.SkillTable; 
    2424import com.l2jserver.gameserver.model.L2Object; 
    25 import com.l2jserver.gameserver.model.L2Skill; 
    2625import com.l2jserver.gameserver.model.actor.L2Character; 
    2726import com.l2jserver.gameserver.model.actor.L2Npc; 
     27import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
     28import com.l2jserver.gameserver.model.skills.L2Skill; 
    2829import com.l2jserver.gameserver.network.SystemMessageId; 
    2930import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 
    … …  
    3233import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    3334import com.l2jserver.gameserver.network.serverpackets.ValidateLocation; 
    34 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    3535 
    3636 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2CastleBlacksmithInstance.java

    r4884 r5146  
    1717import com.l2jserver.gameserver.instancemanager.CastleManorManager; 
    1818import com.l2jserver.gameserver.model.L2Clan; 
     19import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    1920import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage; 
    20 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    2121 
    2222/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2CastleChamberlainInstance.java

    r5093 r5146  
    2727import com.l2jserver.gameserver.datatables.TeleportLocationTable; 
    2828import com.l2jserver.gameserver.model.L2Clan; 
    29 import com.l2jserver.gameserver.model.L2Skill; 
    3029import com.l2jserver.gameserver.model.L2TeleportLocation; 
     30import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    3131import com.l2jserver.gameserver.model.entity.Castle; 
    32 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    3332import com.l2jserver.gameserver.model.itemcontainer.PcInventory; 
     33import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
     34import com.l2jserver.gameserver.model.skills.L2Skill; 
     35import com.l2jserver.gameserver.model.skills.L2SkillType; 
    3436import com.l2jserver.gameserver.network.SystemMessageId; 
    3537import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 
    … …  
    3739import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage; 
    3840import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    39 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    40 import com.l2jserver.gameserver.templates.skills.L2SkillType; 
    4141import com.l2jserver.gameserver.util.Util; 
    4242import com.l2jserver.util.StringUtil; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2CastleDoormenInstance.java

    r4904 r5146  
    1818 
    1919import com.l2jserver.gameserver.model.L2Clan; 
     20import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    2021import com.l2jserver.gameserver.model.entity.clanhall.SiegableHall; 
    21 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    2222 
    2323 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2CastleMagicianInstance.java

    r4866 r5146  
    2525import com.l2jserver.gameserver.model.L2SquadTrainer; 
    2626import com.l2jserver.gameserver.model.actor.L2Character; 
     27import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
     28import com.l2jserver.gameserver.model.effects.L2EffectType; 
    2729import com.l2jserver.gameserver.model.entity.TvTEvent; 
    2830import com.l2jserver.gameserver.network.SystemMessageId; 
    … …  
    3234import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage; 
    3335import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    34 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    35 import com.l2jserver.gameserver.templates.skills.L2EffectType; 
    3636import com.l2jserver.util.Rnd; 
    3737 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2CastleTeleporterInstance.java

    r4981 r5146  
    2525import com.l2jserver.gameserver.model.L2World; 
    2626import com.l2jserver.gameserver.model.actor.L2Npc; 
     27import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    2728import com.l2jserver.gameserver.network.NpcStringId; 
    2829import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage; 
    2930import com.l2jserver.gameserver.network.serverpackets.NpcSay; 
    30 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    3131 
    3232/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2CastleWarehouseInstance.java

    r4921 r5146  
    1515package com.l2jserver.gameserver.model.actor.instance; 
    1616 
     17import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    1718import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 
    1819import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage; 
    19 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    2020 
    2121/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2CastleWyvernManagerInstance.java

    r4921 r5146  
    1515package com.l2jserver.gameserver.model.actor.instance; 
    1616 
    17 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
     17import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    1818 
    1919public class L2CastleWyvernManagerInstance extends L2WyvernManagerInstance 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2ChestInstance.java

    r5131 r5146  
    1717import com.l2jserver.gameserver.datatables.NpcTable; 
    1818import com.l2jserver.gameserver.datatables.SkillTable; 
    19 import com.l2jserver.gameserver.model.L2Skill; 
    2019import com.l2jserver.gameserver.model.actor.L2Character; 
     20import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
     21import com.l2jserver.gameserver.model.skills.L2Skill; 
    2122import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse; 
    22 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    2323import com.l2jserver.util.Rnd; 
    2424 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2ClanHallDoormenInstance.java

    r4417 r5146  
    2121import com.l2jserver.gameserver.instancemanager.ClanHallManager; 
    2222import com.l2jserver.gameserver.model.L2Clan; 
     23import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    2324import com.l2jserver.gameserver.model.entity.ClanHall; 
    2425import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 
    2526import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage; 
    26 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    2727import com.l2jserver.gameserver.util.Evolve; 
    2828 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2ClanHallManagerInstance.java

    r5093 r5146  
    2525import com.l2jserver.gameserver.instancemanager.ClanHallManager; 
    2626import com.l2jserver.gameserver.model.L2Clan; 
    27 import com.l2jserver.gameserver.model.L2Skill; 
    2827import com.l2jserver.gameserver.model.L2TeleportLocation; 
     28import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    2929import com.l2jserver.gameserver.model.entity.ClanHall; 
    3030import com.l2jserver.gameserver.model.entity.clanhall.AuctionableHall; 
    3131import com.l2jserver.gameserver.model.entity.clanhall.SiegableHall; 
     32import com.l2jserver.gameserver.model.skills.L2Skill; 
     33import com.l2jserver.gameserver.model.skills.L2SkillType; 
    3234import com.l2jserver.gameserver.network.SystemMessageId; 
    3335import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 
    3436import com.l2jserver.gameserver.network.serverpackets.AgitDecoInfo; 
    3537import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage; 
    36 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    37 import com.l2jserver.gameserver.templates.skills.L2SkillType; 
    3838 
    3939public class L2ClanHallManagerInstance extends L2MerchantInstance 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2ClanTraderInstance.java

    r5083 r5146  
    1717import com.l2jserver.Config; 
    1818import com.l2jserver.gameserver.model.actor.L2Npc; 
    19 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     19import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
     20import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    2021import com.l2jserver.gameserver.network.SystemMessageId; 
    2122import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 
    … …  
    2324import com.l2jserver.gameserver.network.serverpackets.PledgeShowInfoUpdate; 
    2425import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    25 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    2626 
    2727public final class L2ClanTraderInstance extends L2Npc 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2ClassMasterInstance.java

    r5093 r5146  
    2020import com.l2jserver.gameserver.datatables.ItemTable; 
    2121import com.l2jserver.gameserver.instancemanager.QuestManager; 
     22import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    2223import com.l2jserver.gameserver.model.base.ClassId; 
    2324import com.l2jserver.gameserver.model.quest.Quest; 
    … …  
    2930import com.l2jserver.gameserver.network.serverpackets.TutorialShowQuestionMark; 
    3031import com.l2jserver.gameserver.network.serverpackets.UserInfo; 
    31 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    3232import com.l2jserver.util.StringUtil; 
    3333 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2ControlTowerInstance.java

    r4417 r5146  
    2424import com.l2jserver.gameserver.model.actor.L2Character; 
    2525import com.l2jserver.gameserver.model.actor.L2Npc; 
     26import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    2627import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 
    2728import com.l2jserver.gameserver.network.serverpackets.MyTargetSelected; 
    2829import com.l2jserver.gameserver.network.serverpackets.StatusUpdate; 
    2930import com.l2jserver.gameserver.network.serverpackets.ValidateLocation; 
    30 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    3131 
    3232public class L2ControlTowerInstance extends L2Npc 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2ControllableAirShipInstance.java

    r5093 r5146  
    2121import com.l2jserver.gameserver.idfactory.IdFactory; 
    2222import com.l2jserver.gameserver.model.actor.stat.ControllableAirShipStat; 
     23import com.l2jserver.gameserver.model.actor.templates.L2CharTemplate; 
    2324import com.l2jserver.gameserver.network.SystemMessageId; 
    2425import com.l2jserver.gameserver.network.serverpackets.DeleteObject; 
    2526import com.l2jserver.gameserver.network.serverpackets.MyTargetSelected; 
    2627import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    27 import com.l2jserver.gameserver.templates.chars.L2CharTemplate; 
    2828 
    2929public class L2ControllableAirShipInstance extends L2AirShipInstance 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2ControllableMobInstance.java

    r4417 r5146  
    1919import com.l2jserver.gameserver.ai.L2ControllableMobAI; 
    2020import com.l2jserver.gameserver.model.actor.L2Character; 
    21 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
     21import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    2222 
    2323/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2CubicInstance.java

    r5093 r5146  
    2727import com.l2jserver.gameserver.handler.SkillHandler; 
    2828import com.l2jserver.gameserver.instancemanager.DuelManager; 
    29 import com.l2jserver.gameserver.model.L2Effect; 
    3029import com.l2jserver.gameserver.model.L2Object; 
    3130import com.l2jserver.gameserver.model.L2Party; 
    32 import com.l2jserver.gameserver.model.L2Skill; 
    3331import com.l2jserver.gameserver.model.actor.L2Attackable; 
    3432import com.l2jserver.gameserver.model.actor.L2Character; 
    3533import com.l2jserver.gameserver.model.actor.L2Playable; 
     34import com.l2jserver.gameserver.model.effects.L2Effect; 
    3635import com.l2jserver.gameserver.model.entity.TvTEvent; 
    3736import com.l2jserver.gameserver.model.entity.TvTEventTeam; 
     37import com.l2jserver.gameserver.model.skills.L2Skill; 
     38import com.l2jserver.gameserver.model.skills.L2SkillType; 
     39import com.l2jserver.gameserver.model.skills.l2skills.L2SkillDrain; 
     40import com.l2jserver.gameserver.model.stats.Formulas; 
    3841import com.l2jserver.gameserver.network.SystemMessageId; 
    3942import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse; 
    40 import com.l2jserver.gameserver.skills.Formulas; 
    41 import com.l2jserver.gameserver.skills.l2skills.L2SkillDrain; 
    4243import com.l2jserver.gameserver.taskmanager.AttackStanceTaskManager; 
    43 import com.l2jserver.gameserver.templates.skills.L2SkillType; 
    4444import com.l2jserver.util.Rnd; 
    4545 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2DawnPriestInstance.java

    r4417 r5146  
    1616 
    1717import com.l2jserver.gameserver.SevenSigns; 
     18import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    1819import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 
    1920import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage; 
    20 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    2121 
    2222public class L2DawnPriestInstance extends L2SignsPriestInstance 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2DecoyInstance.java

    r5013 r5146  
    2020import com.l2jserver.gameserver.ThreadPoolManager; 
    2121import com.l2jserver.gameserver.datatables.SkillTable; 
    22 import com.l2jserver.gameserver.model.L2Skill; 
    2322import com.l2jserver.gameserver.model.actor.L2Character; 
    2423import com.l2jserver.gameserver.model.actor.L2Decoy; 
    2524import com.l2jserver.gameserver.model.actor.knownlist.DecoyKnownList; 
    26 import com.l2jserver.gameserver.skills.l2skills.L2SkillDecoy; 
     25import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
     26import com.l2jserver.gameserver.model.skills.L2Skill; 
     27import com.l2jserver.gameserver.model.skills.l2skills.L2SkillDecoy; 
    2728import com.l2jserver.gameserver.taskmanager.DecayTaskManager; 
    28 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    2929 
    3030 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2DefenderInstance.java

    r4904 r5146  
    2929import com.l2jserver.gameserver.model.actor.L2Playable; 
    3030import com.l2jserver.gameserver.model.actor.knownlist.DefenderKnownList; 
     31import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    3132import com.l2jserver.gameserver.model.entity.Castle; 
    3233import com.l2jserver.gameserver.model.entity.Fort; 
    … …  
    3637import com.l2jserver.gameserver.network.serverpackets.StatusUpdate; 
    3738import com.l2jserver.gameserver.network.serverpackets.ValidateLocation; 
    38 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    3939 
    4040public class L2DefenderInstance extends L2Attackable 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2DoorInstance.java

    r5128 r5146  
    3232import com.l2jserver.gameserver.model.L2Clan; 
    3333import com.l2jserver.gameserver.model.L2Object; 
    34 import com.l2jserver.gameserver.model.L2Skill; 
    3534import com.l2jserver.gameserver.model.actor.L2Character; 
    3635import com.l2jserver.gameserver.model.actor.L2Playable; 
    … …  
    3837import com.l2jserver.gameserver.model.actor.stat.DoorStat; 
    3938import com.l2jserver.gameserver.model.actor.status.DoorStatus; 
     39import com.l2jserver.gameserver.model.actor.templates.L2CharTemplate; 
    4040import com.l2jserver.gameserver.model.entity.Castle; 
    4141import com.l2jserver.gameserver.model.entity.ClanHall; 
    4242import com.l2jserver.gameserver.model.entity.Fort; 
    4343import com.l2jserver.gameserver.model.entity.clanhall.SiegableHall; 
    44 import com.l2jserver.gameserver.model.item.L2Weapon; 
    45 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     44import com.l2jserver.gameserver.model.items.L2Weapon; 
     45import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
     46import com.l2jserver.gameserver.model.skills.L2Skill; 
    4647import com.l2jserver.gameserver.network.SystemMessageId; 
    4748import com.l2jserver.gameserver.network.serverpackets.DoorStatusUpdate; 
    … …  
    4950import com.l2jserver.gameserver.network.serverpackets.StaticObject; 
    5051import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    51 import com.l2jserver.gameserver.templates.chars.L2CharTemplate; 
    5252 
    5353/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2DoormenInstance.java

    r5013 r5146  
    2020import com.l2jserver.gameserver.datatables.TeleportLocationTable; 
    2121import com.l2jserver.gameserver.model.L2TeleportLocation; 
     22import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    2223import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 
    2324import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage; 
    24 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    2525 
    2626/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2DungeonGatekeeperInstance.java

    r5093 r5146  
    2121import com.l2jserver.gameserver.model.L2TeleportLocation; 
    2222import com.l2jserver.gameserver.model.actor.L2Npc; 
     23import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    2324import com.l2jserver.gameserver.network.SystemMessageId; 
    2425import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 
    2526import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage; 
    26 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    2727 
    2828 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2DuskPriestInstance.java

    r4417 r5146  
    1616 
    1717import com.l2jserver.gameserver.SevenSigns; 
     18import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    1819import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 
    1920import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage; 
    20 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    2121 
    2222public class L2DuskPriestInstance extends L2SignsPriestInstance 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2EffectPointInstance.java

    r5130 r5146  
    1717import com.l2jserver.gameserver.model.actor.L2Character; 
    1818import com.l2jserver.gameserver.model.actor.L2Npc; 
     19import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    1920import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 
    20 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    2121 
    2222public class L2EffectPointInstance extends L2Npc 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2EventChestInstance.java

    r4417 r5146  
    44 
    55import com.l2jserver.gameserver.model.actor.L2Character; 
     6import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    67import com.l2jserver.gameserver.network.serverpackets.AbstractNpcInfo; 
    78import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket; 
    8 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    99 
    1010/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2EventMonsterInstance.java

    r5131 r5146  
    1515package com.l2jserver.gameserver.model.actor.instance; 
    1616 
    17 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
     17import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    1818 
    1919/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2FameManagerInstance.java

    r5093 r5146  
    1818 
    1919import com.l2jserver.gameserver.model.actor.L2Npc; 
     20import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    2021import com.l2jserver.gameserver.network.SystemMessageId; 
    2122import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 
    … …  
    2324import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage; 
    2425import com.l2jserver.gameserver.network.serverpackets.UserInfo; 
    25 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    2626 
    2727/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2FeedableBeastInstance.java

    r4417 r5146  
    1515package com.l2jserver.gameserver.model.actor.instance; 
    1616 
    17 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
     17import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    1818 
    1919// This class is here mostly for convinience and for avoidance of hardcoded IDs. 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2FestivalGuideInstance.java

    r4921 r5146  
    1919import com.l2jserver.gameserver.SevenSignsFestival; 
    2020import com.l2jserver.gameserver.model.actor.L2Npc; 
     21import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    2122import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 
    2223import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage; 
    23 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    2424import com.l2jserver.util.StringUtil; 
    2525 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2FestivalMonsterInstance.java

    r5083 r5146  
    1818import com.l2jserver.gameserver.model.L2Party; 
    1919import com.l2jserver.gameserver.model.actor.L2Character; 
    20 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     20import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
     21import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    2122import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate; 
    22 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    2323 
    2424/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2FishermanInstance.java

    r5093 r5146  
    1919import com.l2jserver.gameserver.datatables.SkillTable; 
    2020import com.l2jserver.gameserver.datatables.SkillTreesData; 
    21 import com.l2jserver.gameserver.model.L2Skill; 
    2221import com.l2jserver.gameserver.model.L2SkillLearn; 
     22import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
     23import com.l2jserver.gameserver.model.skills.L2Skill; 
    2324import com.l2jserver.gameserver.network.SystemMessageId; 
    2425import com.l2jserver.gameserver.network.serverpackets.AcquireSkillList; 
    2526import com.l2jserver.gameserver.network.serverpackets.AcquireSkillList.SkillType; 
    2627import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    27 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    2828 
    2929public final class L2FishermanInstance extends L2MerchantInstance 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2FlameTowerInstance.java

    r4417 r5146  
    1919import com.l2jserver.gameserver.model.actor.L2Character; 
    2020import com.l2jserver.gameserver.model.actor.L2Npc; 
     21import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    2122import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 
    2223import com.l2jserver.gameserver.network.serverpackets.MyTargetSelected; 
    2324import com.l2jserver.gameserver.network.serverpackets.StatusUpdate; 
    2425import com.l2jserver.gameserver.network.serverpackets.ValidateLocation; 
    25 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    2626 
    2727/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2FlyMonsterInstance.java

    r4417 r5146  
    1515package com.l2jserver.gameserver.model.actor.instance; 
    1616 
    17 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
     17import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    1818 
    1919public final class L2FlyMonsterInstance extends L2MonsterInstance 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2FlyNpcInstance.java

    r4417 r5146  
    1515package com.l2jserver.gameserver.model.actor.instance; 
    1616 
    17 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
     17import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    1818 
    1919public final class L2FlyNpcInstance extends L2NpcInstance 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2FlyRaidBossInstance.java

    r4417 r5146  
    1515package com.l2jserver.gameserver.model.actor.instance; 
    1616 
    17 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
     17import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    1818 
    1919public final class L2FlyRaidBossInstance extends L2RaidBossInstance 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2FlyTerrainObjectInstance.java

    r5098 r5146  
    1616 
    1717import com.l2jserver.gameserver.model.actor.L2Npc; 
     18import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    1819import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 
    19 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    2020 
    2121public final class L2FlyTerrainObjectInstance extends L2Npc 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2FortBallistaInstance.java

    r5093 r5146  
    1919import com.l2jserver.gameserver.model.actor.L2Character; 
    2020import com.l2jserver.gameserver.model.actor.L2Npc; 
     21import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    2122import com.l2jserver.gameserver.network.SystemMessageId; 
    2223import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 
    2324import com.l2jserver.gameserver.network.serverpackets.MyTargetSelected; 
    2425import com.l2jserver.gameserver.network.serverpackets.ValidateLocation; 
    25 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    2626 
    2727 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2FortCommanderInstance.java

    r4981 r5146  
    2323import com.l2jserver.gameserver.instancemanager.FortSiegeManager.SiegeSpawn; 
    2424import com.l2jserver.gameserver.model.L2CharPosition; 
    25 import com.l2jserver.gameserver.model.L2Skill; 
    2625import com.l2jserver.gameserver.model.L2Spawn; 
    2726import com.l2jserver.gameserver.model.actor.L2Character; 
    2827import com.l2jserver.gameserver.model.actor.L2Summon; 
     28import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
     29import com.l2jserver.gameserver.model.skills.L2Skill; 
    2930import com.l2jserver.gameserver.network.NpcStringId; 
    3031import com.l2jserver.gameserver.network.serverpackets.NpcSay; 
    31 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    3232 
    3333public class L2FortCommanderInstance extends L2DefenderInstance 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2FortDoormenInstance.java

    r5013 r5146  
    1717import java.util.StringTokenizer; 
    1818 
     19import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    1920import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 
    2021import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage; 
    21 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    2222 
    2323 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2FortEnvoyInstance.java

    r4866 r5146  
    1919import com.l2jserver.gameserver.instancemanager.CastleManager; 
    2020import com.l2jserver.gameserver.model.actor.L2Npc; 
     21import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    2122import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 
    2223import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage; 
    23 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    2424 
    2525public class L2FortEnvoyInstance extends L2Npc 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2FortLogisticsInstance.java

    r4884 r5146  
    1919import com.l2jserver.gameserver.datatables.NpcTable; 
    2020import com.l2jserver.gameserver.idfactory.IdFactory; 
     21import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    2122import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 
    2223import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage; 
    23 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    2424 
    2525/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2FortManagerInstance.java

    r5013 r5146  
    2424import com.l2jserver.gameserver.instancemanager.CastleManager; 
    2525import com.l2jserver.gameserver.model.L2Clan; 
    26 import com.l2jserver.gameserver.model.L2Skill; 
    2726import com.l2jserver.gameserver.model.L2TeleportLocation; 
     27import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    2828import com.l2jserver.gameserver.model.entity.Fort; 
     29import com.l2jserver.gameserver.model.skills.L2Skill; 
     30import com.l2jserver.gameserver.model.skills.L2SkillType; 
    2931import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 
    3032import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage; 
    … …  
    3335import com.l2jserver.gameserver.network.serverpackets.WareHouseDepositList; 
    3436import com.l2jserver.gameserver.network.serverpackets.WareHouseWithdrawalList; 
    35 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    36 import com.l2jserver.gameserver.templates.skills.L2SkillType; 
    3737 
    3838/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2FortSiegeNpcInstance.java

    r4417 r5146  
    1515package com.l2jserver.gameserver.model.actor.instance; 
    1616 
     17import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    1718import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 
    1819import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage; 
    19 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    2020 
    2121/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2FortSupportCaptainInstance.java

    r4866 r5146  
    2323import com.l2jserver.gameserver.model.L2SkillLearn; 
    2424import com.l2jserver.gameserver.model.L2SquadTrainer; 
     25import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    2526import com.l2jserver.gameserver.network.SystemMessageId; 
    2627import com.l2jserver.gameserver.network.serverpackets.AcquireSkillList; 
    … …  
    2829import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage; 
    2930import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    30 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    3131import com.l2jserver.util.Rnd; 
    3232 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2FortWyvernManagerInstance.java

    r4921 r5146  
    1515package com.l2jserver.gameserver.model.actor.instance; 
    1616 
    17 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
     17import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    1818 
    1919public class L2FortWyvernManagerInstance extends L2WyvernManagerInstance 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2FriendlyMobInstance.java

    r4417 r5146  
    1818import com.l2jserver.gameserver.model.actor.L2Character; 
    1919import com.l2jserver.gameserver.model.actor.knownlist.FriendlyMobKnownList; 
    20 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
     20import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    2121 
    2222/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2GrandBossInstance.java

    r5134 r5146  
    1818import com.l2jserver.gameserver.model.actor.L2Character; 
    1919import com.l2jserver.gameserver.model.actor.L2Summon; 
     20import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    2021import com.l2jserver.gameserver.model.entity.Hero; 
    2122import com.l2jserver.gameserver.network.SystemMessageId; 
    2223import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    23 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    2424import com.l2jserver.util.Rnd; 
    2525 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2GuardInstance.java

    r5058 r5146  
    2727import com.l2jserver.gameserver.model.actor.L2Character; 
    2828import com.l2jserver.gameserver.model.actor.knownlist.GuardKnownList; 
     29import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    2930import com.l2jserver.gameserver.model.quest.Quest; 
    3031import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 
    … …  
    3233import com.l2jserver.gameserver.network.serverpackets.SocialAction; 
    3334import com.l2jserver.gameserver.network.serverpackets.ValidateLocation; 
    34 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    3535import com.l2jserver.util.Rnd; 
    3636 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2ManorManagerInstance.java

    r4866 r5146  
    1616 
    1717import com.l2jserver.gameserver.instancemanager.CastleManorManager; 
    18 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
     18import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    1919 
    2020public class L2ManorManagerInstance extends L2MerchantInstance 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2MercManagerInstance.java

    r4417 r5146  
    1818 
    1919import com.l2jserver.gameserver.model.L2Clan; 
     20import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    2021import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage; 
    21 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    2222 
    2323public final class L2MercManagerInstance extends L2MerchantInstance 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2MercenaryManagerInstance.java

    r4024 r5146  
    1919import com.l2jserver.gameserver.instancemanager.TerritoryWarManager; 
    2020import com.l2jserver.gameserver.model.actor.L2Npc; 
    21 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
     21import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    2222 
    2323/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2MerchantInstance.java

    r4921 r5146  
    2020import com.l2jserver.gameserver.datatables.MerchantPriceConfigTable.MerchantPriceConfig; 
    2121import com.l2jserver.gameserver.model.L2TradeList; 
     22import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    2223import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 
    2324import com.l2jserver.gameserver.network.serverpackets.BuyList; 
    2425import com.l2jserver.gameserver.network.serverpackets.ExBuySellListPacket; 
    25 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    2626 
    2727/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2MerchantSummonInstance.java

    r4469 r5146  
    2222import com.l2jserver.gameserver.ai.L2CharacterAI; 
    2323import com.l2jserver.gameserver.model.L2Party; 
    24 import com.l2jserver.gameserver.model.L2Skill; 
    2524import com.l2jserver.gameserver.model.L2TradeList; 
    2625import com.l2jserver.gameserver.model.L2WorldRegion; 
    2726import com.l2jserver.gameserver.model.actor.L2Character; 
     27import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
     28import com.l2jserver.gameserver.model.skills.L2Skill; 
    2829import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 
    2930import com.l2jserver.gameserver.network.serverpackets.BuyList; 
    … …  
    3334import com.l2jserver.gameserver.network.serverpackets.SellList; 
    3435import com.l2jserver.gameserver.network.serverpackets.ValidateLocation; 
    35 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    3636 
    3737 
    … …  
    3939 * @author Kerberos 
    4040 */ 
    41 public class L2MerchantSummonInstance extends L2SummonInstance 
     41public class L2MerchantSummonInstance extends L2ServitorInstance 
    4242{ 
    4343        public L2MerchantSummonInstance(int objectId, L2NpcTemplate template, L2PcInstance owner, L2Skill skill) 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2MonsterInstance.java

    r5098 r5146  
    2121import com.l2jserver.gameserver.model.actor.L2Character; 
    2222import com.l2jserver.gameserver.model.actor.knownlist.MonsterKnownList; 
    23 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
     23import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    2424import com.l2jserver.gameserver.util.MinionList; 
    2525import com.l2jserver.util.Rnd; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2NpcBufferInstance.java

    r5134 r5146  
    2222import com.l2jserver.gameserver.datatables.NpcBufferTable; 
    2323import com.l2jserver.gameserver.datatables.SkillTable; 
    24 import com.l2jserver.gameserver.model.L2Skill; 
    2524import com.l2jserver.gameserver.model.actor.L2Character; 
    2625import com.l2jserver.gameserver.model.actor.L2Npc; 
    2726import com.l2jserver.gameserver.model.actor.L2Summon; 
    28 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     27import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
     28import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
     29import com.l2jserver.gameserver.model.skills.L2Skill; 
    2930import com.l2jserver.gameserver.network.SystemMessageId; 
    3031import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 
    … …  
    3233import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    3334import com.l2jserver.gameserver.taskmanager.AttackStanceTaskManager; 
    34 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    3535 
    3636/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2NpcInstance.java

    r5014 r5146  
    2323import com.l2jserver.gameserver.datatables.SkillTable; 
    2424import com.l2jserver.gameserver.datatables.SkillTreesData; 
    25 import com.l2jserver.gameserver.model.L2Effect; 
    26 import com.l2jserver.gameserver.model.L2Skill; 
    2725import com.l2jserver.gameserver.model.L2SkillLearn; 
    2826import com.l2jserver.gameserver.model.actor.L2Npc; 
    2927import com.l2jserver.gameserver.model.actor.status.FolkStatus; 
     28import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    3029import com.l2jserver.gameserver.model.base.ClassId; 
     30import com.l2jserver.gameserver.model.effects.L2Effect; 
     31import com.l2jserver.gameserver.model.skills.L2Skill; 
    3132import com.l2jserver.gameserver.network.SystemMessageId; 
    3233import com.l2jserver.gameserver.network.serverpackets.AcquireSkillList; 
    … …  
    3435import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage; 
    3536import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    36 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    3737import com.l2jserver.util.StringUtil; 
    3838 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2NpcWalkerInstance.java

    r4921 r5146  
    1717import com.l2jserver.gameserver.ai.L2CharacterAI; 
    1818import com.l2jserver.gameserver.ai.L2NpcWalkerAI; 
    19 import com.l2jserver.gameserver.model.L2Skill; 
    2019import com.l2jserver.gameserver.model.actor.L2Character; 
    2120import com.l2jserver.gameserver.model.actor.L2Npc; 
     21import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
     22import com.l2jserver.gameserver.model.skills.L2Skill; 
    2223import com.l2jserver.gameserver.network.NpcStringId; 
    2324import com.l2jserver.gameserver.network.clientpackets.Say2; 
    2425import com.l2jserver.gameserver.network.serverpackets.NpcSay; 
    25 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    2626import com.l2jserver.gameserver.util.Broadcast; 
    2727 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2ObservationInstance.java

    r4417 r5146  
    1616 
    1717import com.l2jserver.gameserver.model.actor.L2Npc; 
     18import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    1819import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage; 
    19 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    2020 
    2121/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2OlympiadManagerInstance.java

    r4426 r5146  
    1616 
    1717import com.l2jserver.gameserver.model.actor.L2Npc; 
     18import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    1819import com.l2jserver.gameserver.model.olympiad.Olympiad; 
    19 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    2020 
    2121/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java

    r5132 r5146  
    103103import com.l2jserver.gameserver.model.L2ClanMember; 
    104104import com.l2jserver.gameserver.model.L2ContactList; 
    105 import com.l2jserver.gameserver.model.L2Effect; 
    106105import com.l2jserver.gameserver.model.L2EnchantSkillLearn; 
    107106import com.l2jserver.gameserver.model.L2Fishing; 
    … …  
    119118import com.l2jserver.gameserver.model.L2Request; 
    120119import com.l2jserver.gameserver.model.L2ShortCut; 
    121 import com.l2jserver.gameserver.model.L2Skill; 
    122120import com.l2jserver.gameserver.model.L2SkillLearn; 
    123121import com.l2jserver.gameserver.model.L2Transformation; 
    … …  
    146144import com.l2jserver.gameserver.model.actor.stat.PcStat; 
    147145import com.l2jserver.gameserver.model.actor.status.PcStatus; 
     146import com.l2jserver.gameserver.model.actor.templates.L2PcTemplate; 
    148147import com.l2jserver.gameserver.model.base.ClassId; 
    149148import com.l2jserver.gameserver.model.base.ClassLevel; 
    … …  
    151150import com.l2jserver.gameserver.model.base.Race; 
    152151import com.l2jserver.gameserver.model.base.SubClass; 
     152import com.l2jserver.gameserver.model.effects.AbnormalEffect; 
     153import com.l2jserver.gameserver.model.effects.EffectTemplate; 
     154import com.l2jserver.gameserver.model.effects.L2Effect; 
     155import com.l2jserver.gameserver.model.effects.L2EffectType; 
    153156import com.l2jserver.gameserver.model.entity.Castle; 
    154157import com.l2jserver.gameserver.model.entity.Duel; 
    … …  
    159162import com.l2jserver.gameserver.model.entity.Siege; 
    160163import com.l2jserver.gameserver.model.entity.TvTEvent; 
    161 import com.l2jserver.gameserver.model.item.L2Armor; 
    162 import com.l2jserver.gameserver.model.item.L2EtcItem; 
    163 import com.l2jserver.gameserver.model.item.L2Henna; 
    164 import com.l2jserver.gameserver.model.item.L2Item; 
    165 import com.l2jserver.gameserver.model.item.L2Weapon; 
    166 import com.l2jserver.gameserver.model.item.instance.L2HennaInstance; 
    167 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    168 import com.l2jserver.gameserver.model.item.type.L2ArmorType; 
    169 import com.l2jserver.gameserver.model.item.type.L2EtcItemType; 
    170 import com.l2jserver.gameserver.model.item.type.L2WeaponType; 
    171164import com.l2jserver.gameserver.model.itemcontainer.Inventory; 
    172165import com.l2jserver.gameserver.model.itemcontainer.ItemContainer; 
    … …  
    176169import com.l2jserver.gameserver.model.itemcontainer.PcWarehouse; 
    177170import com.l2jserver.gameserver.model.itemcontainer.PetInventory; 
     171import com.l2jserver.gameserver.model.items.L2Armor; 
     172import com.l2jserver.gameserver.model.items.L2EtcItem; 
     173import com.l2jserver.gameserver.model.items.L2Henna; 
     174import com.l2jserver.gameserver.model.items.L2Item; 
     175import com.l2jserver.gameserver.model.items.L2Weapon; 
     176import com.l2jserver.gameserver.model.items.instance.L2HennaInstance; 
     177import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
     178import com.l2jserver.gameserver.model.items.type.L2ArmorType; 
     179import com.l2jserver.gameserver.model.items.type.L2EtcItemType; 
     180import com.l2jserver.gameserver.model.items.type.L2WeaponType; 
    178181import com.l2jserver.gameserver.model.multisell.PreparedListContainer; 
    179182import com.l2jserver.gameserver.model.olympiad.OlympiadGameManager; 
    … …  
    183186import com.l2jserver.gameserver.model.quest.QuestState; 
    184187import com.l2jserver.gameserver.model.quest.State; 
     188import com.l2jserver.gameserver.model.skills.L2Skill; 
     189import com.l2jserver.gameserver.model.skills.L2SkillType; 
     190import com.l2jserver.gameserver.model.skills.l2skills.L2SkillSiegeFlag; 
     191import com.l2jserver.gameserver.model.skills.l2skills.L2SkillSummon; 
     192import com.l2jserver.gameserver.model.skills.l2skills.L2SkillTrap; 
     193import com.l2jserver.gameserver.model.skills.targets.L2TargetType; 
     194import com.l2jserver.gameserver.model.stats.Env; 
     195import com.l2jserver.gameserver.model.stats.Formulas; 
     196import com.l2jserver.gameserver.model.stats.Stats; 
    185197import com.l2jserver.gameserver.model.zone.L2ZoneType; 
    186198import com.l2jserver.gameserver.model.zone.type.L2BossZone; 
    … …  
    257269import com.l2jserver.gameserver.network.serverpackets.TradeStart; 
    258270import com.l2jserver.gameserver.network.serverpackets.UserInfo; 
    259 import com.l2jserver.gameserver.skills.AbnormalEffect; 
    260 import com.l2jserver.gameserver.skills.Env; 
    261 import com.l2jserver.gameserver.skills.Formulas; 
    262 import com.l2jserver.gameserver.skills.Stats; 
    263 import com.l2jserver.gameserver.skills.l2skills.L2SkillSiegeFlag; 
    264 import com.l2jserver.gameserver.skills.l2skills.L2SkillSummon; 
    265 import com.l2jserver.gameserver.skills.l2skills.L2SkillTrap; 
    266271import com.l2jserver.gameserver.taskmanager.AttackStanceTaskManager; 
    267 import com.l2jserver.gameserver.templates.chars.L2PcTemplate; 
    268 import com.l2jserver.gameserver.templates.effects.EffectTemplate; 
    269 import com.l2jserver.gameserver.templates.skills.L2EffectType; 
    270 import com.l2jserver.gameserver.templates.skills.L2SkillType; 
    271 import com.l2jserver.gameserver.templates.skills.L2TargetType; 
    272272import com.l2jserver.gameserver.util.FloodProtectors; 
    273273import com.l2jserver.gameserver.util.L2TIntObjectHashMap; 
    … …  
    42864286        /** 
    42874287         *  
    4288          * @see com.l2jserver.gameserver.model.actor.L2Character#enableSkill(com.l2jserver.gameserver.model.L2Skill) 
     4288         * @see com.l2jserver.gameserver.model.actor.L2Character#enableSkill(com.l2jserver.gameserver.model.skills.L2Skill) 
    42894289         */ 
    42904290        @Override 
    … …  
    42974297        /** 
    42984298         *  
    4299          * @see com.l2jserver.gameserver.model.actor.L2Character#checkDoCastConditions(com.l2jserver.gameserver.model.L2Skill) 
     4299         * @see com.l2jserver.gameserver.model.actor.L2Character#checkDoCastConditions(com.l2jserver.gameserver.model.skills.L2Skill) 
    43004300         */ 
    43014301        @Override 
    … …  
    1088210882                        stopChargeTask(); 
    1088310883                         
    10884                         if (getPet() instanceof L2SummonInstance) 
     10884                        if (getPet() instanceof L2ServitorInstance) 
    1088510885                                getPet().unSummon(this); 
    1088610886                         

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2PenaltyMonsterInstance.java

    r4884 r5146  
    1717import com.l2jserver.gameserver.ai.CtrlEvent; 
    1818import com.l2jserver.gameserver.model.actor.L2Character; 
     19import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    1920import com.l2jserver.gameserver.network.NpcStringId; 
    2021import com.l2jserver.gameserver.network.clientpackets.Say2; 
    2122import com.l2jserver.gameserver.network.serverpackets.CreatureSay; 
    22 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    2323import com.l2jserver.util.Rnd; 
    2424 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2PetInstance.java

    r5134 r5146  
    4040import com.l2jserver.gameserver.instancemanager.CursedWeaponsManager; 
    4141import com.l2jserver.gameserver.instancemanager.ItemsOnGroundManager; 
    42 import com.l2jserver.gameserver.model.L2Effect; 
    4342import com.l2jserver.gameserver.model.L2Object; 
    4443import com.l2jserver.gameserver.model.L2PetData; 
    4544import com.l2jserver.gameserver.model.L2PetLevelData; 
    46 import com.l2jserver.gameserver.model.L2Skill; 
    4745import com.l2jserver.gameserver.model.L2World; 
    4846import com.l2jserver.gameserver.model.actor.L2Character; 
    4947import com.l2jserver.gameserver.model.actor.L2Summon; 
    5048import com.l2jserver.gameserver.model.actor.stat.PetStat; 
    51 import com.l2jserver.gameserver.model.item.L2Item; 
    52 import com.l2jserver.gameserver.model.item.L2Weapon; 
    53 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    54 import com.l2jserver.gameserver.model.item.type.L2EtcItemType; 
     49import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
     50import com.l2jserver.gameserver.model.effects.EffectTemplate; 
     51import com.l2jserver.gameserver.model.effects.L2Effect; 
    5552import com.l2jserver.gameserver.model.itemcontainer.Inventory; 
    5653import com.l2jserver.gameserver.model.itemcontainer.PcInventory; 
    5754import com.l2jserver.gameserver.model.itemcontainer.PetInventory; 
     55import com.l2jserver.gameserver.model.items.L2Item; 
     56import com.l2jserver.gameserver.model.items.L2Weapon; 
     57import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
     58import com.l2jserver.gameserver.model.items.type.L2EtcItemType; 
     59import com.l2jserver.gameserver.model.skills.L2Skill; 
     60import com.l2jserver.gameserver.model.stats.Env; 
     61import com.l2jserver.gameserver.model.stats.Stats; 
    5862import com.l2jserver.gameserver.network.SystemMessageId; 
    5963import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 
    … …  
    6468import com.l2jserver.gameserver.network.serverpackets.StopMove; 
    6569import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    66 import com.l2jserver.gameserver.skills.Env; 
    67 import com.l2jserver.gameserver.skills.Stats; 
    6870import com.l2jserver.gameserver.taskmanager.DecayTaskManager; 
    69 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    70 import com.l2jserver.gameserver.templates.effects.EffectTemplate; 
    7171import com.l2jserver.gameserver.util.Util; 
    7272import com.l2jserver.util.Rnd; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2PetManagerInstance.java

    r4417 r5146  
    1717import com.l2jserver.Config; 
    1818import com.l2jserver.gameserver.model.actor.L2Summon; 
     19import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    1920import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage; 
    20 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    2121import com.l2jserver.gameserver.util.Evolve; 
    2222 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2QuestGuardInstance.java

    r4959 r5146  
    1616 
    1717import com.l2jserver.gameserver.ThreadPoolManager; 
    18 import com.l2jserver.gameserver.model.L2Skill; 
    1918import com.l2jserver.gameserver.model.actor.L2Attackable; 
    2019import com.l2jserver.gameserver.model.actor.L2Character; 
     20import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    2121import com.l2jserver.gameserver.model.quest.Quest; 
    22 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
     22import com.l2jserver.gameserver.model.skills.L2Skill; 
    2323 
    2424/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2RaceManagerInstance.java

    r5093 r5146  
    2424import com.l2jserver.gameserver.model.actor.L2Npc; 
    2525import com.l2jserver.gameserver.model.actor.knownlist.RaceManagerKnownList; 
    26 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     26import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    2727import com.l2jserver.gameserver.model.itemcontainer.PcInventory; 
     28import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    2829import com.l2jserver.gameserver.network.SystemMessageId; 
    2930import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 
    … …  
    3536import com.l2jserver.gameserver.network.serverpackets.PlaySound; 
    3637import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    37 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    3838import com.l2jserver.gameserver.util.Broadcast; 
    3939 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2RaidBossInstance.java

    r5134 r5146  
    1919import com.l2jserver.gameserver.instancemanager.RaidBossPointsManager; 
    2020import com.l2jserver.gameserver.instancemanager.RaidBossSpawnManager; 
    21 import com.l2jserver.gameserver.model.L2Skill; 
    2221import com.l2jserver.gameserver.model.L2Spawn; 
    2322import com.l2jserver.gameserver.model.actor.L2Character; 
    2423import com.l2jserver.gameserver.model.actor.L2Summon; 
     24import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    2525import com.l2jserver.gameserver.model.entity.Hero; 
     26import com.l2jserver.gameserver.model.skills.L2Skill; 
    2627import com.l2jserver.gameserver.network.SystemMessageId; 
    2728import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    28 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    2929import com.l2jserver.util.Rnd; 
    3030 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2RiftInvaderInstance.java

    r3990 r5146  
    1515package com.l2jserver.gameserver.model.actor.instance; 
    1616 
    17 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
     17import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    1818 
    1919public class L2RiftInvaderInstance extends L2MonsterInstance 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2SepulcherMonsterInstance.java

    r5013 r5146  
    2020import com.l2jserver.gameserver.datatables.SkillTable; 
    2121import com.l2jserver.gameserver.instancemanager.FourSepulchersManager; 
    22 import com.l2jserver.gameserver.model.L2Skill; 
    2322import com.l2jserver.gameserver.model.actor.L2Character; 
     23import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    2424import com.l2jserver.gameserver.model.quest.QuestState; 
     25import com.l2jserver.gameserver.model.skills.L2Skill; 
    2526import com.l2jserver.gameserver.network.serverpackets.NpcSay; 
    26 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    2727 
    2828 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2SepulcherNpcInstance.java

    r5083 r5146  
    2626import com.l2jserver.gameserver.model.L2World; 
    2727import com.l2jserver.gameserver.model.actor.L2Npc; 
    28 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     28import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
     29import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    2930import com.l2jserver.gameserver.model.quest.Quest; 
    3031import com.l2jserver.gameserver.network.NpcStringId; 
    … …  
    3738import com.l2jserver.gameserver.network.serverpackets.StatusUpdate; 
    3839import com.l2jserver.gameserver.network.serverpackets.ValidateLocation; 
    39 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    4040import com.l2jserver.gameserver.util.Util; 
    4141import com.l2jserver.util.Rnd; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2ServitorInstance.java

    r5129 r5146  
    3434import com.l2jserver.gameserver.datatables.SummonEffectsTable; 
    3535import com.l2jserver.gameserver.datatables.SummonEffectsTable.SummonEffect; 
    36 import com.l2jserver.gameserver.model.L2Effect; 
    3736import com.l2jserver.gameserver.model.L2Object; 
    38 import com.l2jserver.gameserver.model.L2Skill; 
    3937import com.l2jserver.gameserver.model.actor.L2Character; 
    4038import com.l2jserver.gameserver.model.actor.L2Summon; 
     39import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
     40import com.l2jserver.gameserver.model.effects.EffectTemplate; 
     41import com.l2jserver.gameserver.model.effects.L2Effect; 
     42import com.l2jserver.gameserver.model.skills.L2Skill; 
     43import com.l2jserver.gameserver.model.skills.l2skills.L2SkillSummon; 
     44import com.l2jserver.gameserver.model.stats.Env; 
    4145import com.l2jserver.gameserver.network.serverpackets.SetSummonRemainTime; 
    42 import com.l2jserver.gameserver.skills.Env; 
    43 import com.l2jserver.gameserver.skills.l2skills.L2SkillSummon; 
    44 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    45 import com.l2jserver.gameserver.templates.effects.EffectTemplate; 
    46  
    47  
    48 public class L2SummonInstance extends L2Summon 
     46 
     47 
     48public class L2ServitorInstance extends L2Summon 
    4949{ 
    50         protected static final Logger log = Logger.getLogger(L2SummonInstance.class.getName()); 
     50        protected static final Logger log = Logger.getLogger(L2ServitorInstance.class.getName()); 
    5151         
    5252        private static final String ADD_SKILL_SAVE = "INSERT INTO character_summon_skills_save (ownerId,ownerClassIndex,summonSkillId,skill_id,skill_level,effect_count,effect_cur_time,buff_index) VALUES (?,?,?,?,?,?,?,?)"; 
    … …  
    7272        private double _sharedElementalsPercent = 1; 
    7373         
    74         public L2SummonInstance(int objectId, L2NpcTemplate template, L2PcInstance owner, L2Skill skill) 
     74        public L2ServitorInstance(int objectId, L2NpcTemplate template, L2PcInstance owner, L2Skill skill) 
    7575        { 
    7676                super(objectId, template, owner); 
    77                 setInstanceType(InstanceType.L2SummonInstance); 
     77                setInstanceType(InstanceType.L2ServitorInstance); 
    7878                setShowSummonAnimation(true); 
    7979                 
    … …  
    114114                 
    115115                if (Config.DEBUG && (_itemConsumeCount != 0)) 
    116                         _log.warning("L2SummonInstance: Item Consume ID: " + _itemConsumeId + ", Count: " + _itemConsumeCount + ", Rate: " + _itemConsumeSteps + " times."); 
     116                        _log.warning(getClass().getSimpleName() + ": Item Consume ID: " + _itemConsumeId + ", Count: " + _itemConsumeCount + ", Rate: " + _itemConsumeSteps + " times."); 
    117117                if (Config.DEBUG) 
    118                         _log.warning("L2SummonInstance: Task Delay " + (delay / 1000) + " seconds."); 
     118                        _log.warning(getClass().getSimpleName() + ": Task Delay " + (delay / 1000) + " seconds."); 
    119119                 
    120120                _summonLifeTask = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new SummonLifetime(getOwner(), this), delay, delay); 
    … …  
    230230                 
    231231                if (Config.DEBUG) 
    232                         _log.warning("L2SummonInstance: " + getTemplate().getName() + " (" + getOwner().getName() + ") has been killed."); 
     232                        _log.warning(getClass().getSimpleName() + ": " + getTemplate().getName() + " (" + getOwner().getName() + ") has been killed."); 
    233233                 
    234234                if (_summonLifeTask != null) 
    … …  
    250250         * the max that does exist! 
    251251         * 
    252          * @see com.l2jserver.gameserver.model.actor.L2Character#doCast(com.l2jserver.gameserver.model.L2Skill) 
     252         * @see com.l2jserver.gameserver.model.actor.L2Character#doCast(com.l2jserver.gameserver.model.skills.L2Skill) 
    253253         */ 
    254254        @Override 
    … …  
    503503        { 
    504504                private final L2PcInstance _activeChar; 
    505                 private final L2SummonInstance _summon; 
    506                  
    507                 SummonLifetime(L2PcInstance activeChar, L2SummonInstance newpet) 
     505                private final L2ServitorInstance _summon; 
     506                 
     507                SummonLifetime(L2PcInstance activeChar, L2ServitorInstance newpet) 
    508508                { 
    509509                        _activeChar = activeChar; 
    … …  
    515515                { 
    516516                        if (Config.DEBUG) 
    517                                 log.warning("L2SummonInstance: " + _summon.getTemplate().getName() + " (" + _activeChar.getName() + ") run task."); 
     517                                log.warning(getClass().getSimpleName() + ": " + _summon.getTemplate().getName() + " (" + _activeChar.getName() + ") run task."); 
    518518                         
    519519                        try 
    … …  
    569569        { 
    570570                if (Config.DEBUG) 
    571                         _log.warning("L2SummonInstance: " + getTemplate().getName() + " (" + owner.getName() + ") unsummoned."); 
     571                        _log.warning(getClass().getSimpleName() + ": " + getTemplate().getName() + " (" + owner.getName() + ") unsummoned."); 
    572572                 
    573573                if (_summonLifeTask != null) 
    … …  
    593593        { 
    594594                if (Config.DEBUG) 
    595                         _log.warning("L2SummonInstance: " + getTemplate().getName() + " (" + getOwner().getName() + ") consume."); 
     595                        _log.warning(getClass().getSimpleName() + ": " + getTemplate().getName() + " (" + getOwner().getName() + ") consume."); 
    596596                 
    597597                return getOwner().destroyItemByItemId(process, itemId, count, reference, sendMessage); 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2SiegeFlagInstance.java

    r4981 r5146  
    2323import com.l2jserver.gameserver.model.L2Clan; 
    2424import com.l2jserver.gameserver.model.L2SiegeClan; 
    25 import com.l2jserver.gameserver.model.L2Skill; 
    2625import com.l2jserver.gameserver.model.actor.L2Character; 
    2726import com.l2jserver.gameserver.model.actor.L2Npc; 
    2827import com.l2jserver.gameserver.model.actor.status.SiegeFlagStatus; 
     28import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    2929import com.l2jserver.gameserver.model.entity.Siegable; 
     30import com.l2jserver.gameserver.model.skills.L2Skill; 
    3031import com.l2jserver.gameserver.network.SystemMessageId; 
    3132import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 
    … …  
    3435import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    3536import com.l2jserver.gameserver.network.serverpackets.ValidateLocation; 
    36 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    3737 
    3838public class L2SiegeFlagInstance extends L2Npc 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2SiegeNpcInstance.java

    r4904 r5146  
    1515package com.l2jserver.gameserver.model.actor.instance; 
    1616 
     17import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    1718import com.l2jserver.gameserver.model.entity.clanhall.SiegableHall; 
    1819import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 
    1920import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage; 
    20 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    2121 
    2222/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2SiegeSummonInstance.java

    r4417 r5146  
    1515package com.l2jserver.gameserver.model.actor.instance; 
    1616 
    17 import com.l2jserver.gameserver.model.L2Skill; 
    1817import com.l2jserver.gameserver.model.actor.L2Character; 
    19 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
     18import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
     19import com.l2jserver.gameserver.model.skills.L2Skill; 
    2020 
    21 public class L2SiegeSummonInstance extends L2SummonInstance 
     21public class L2SiegeSummonInstance extends L2ServitorInstance 
    2222{ 
    2323        public static final int SIEGE_GOLEM_ID = 14737; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2SignsPriestInstance.java

    r5093 r5146  
    2424import com.l2jserver.gameserver.cache.HtmCache; 
    2525import com.l2jserver.gameserver.model.actor.L2Npc; 
    26 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     26import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    2727import com.l2jserver.gameserver.model.itemcontainer.PcInventory; 
     28import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    2829import com.l2jserver.gameserver.network.SystemMessageId; 
    2930import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage; 
    3031import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    31 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    3232 
    3333/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2StaticObjectInstance.java

    r5134 r5146  
    1919import com.l2jserver.gameserver.ai.L2CharacterAI; 
    2020import com.l2jserver.gameserver.model.L2CharPosition; 
    21 import com.l2jserver.gameserver.model.L2Skill; 
    2221import com.l2jserver.gameserver.model.actor.L2Character; 
    2322import com.l2jserver.gameserver.model.actor.knownlist.StaticObjectKnownList; 
    2423import com.l2jserver.gameserver.model.actor.stat.StaticObjStat; 
    2524import com.l2jserver.gameserver.model.actor.status.StaticObjStatus; 
    26 import com.l2jserver.gameserver.model.item.L2Weapon; 
    27 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     25import com.l2jserver.gameserver.model.actor.templates.L2CharTemplate; 
     26import com.l2jserver.gameserver.model.items.L2Weapon; 
     27import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
     28import com.l2jserver.gameserver.model.skills.L2Skill; 
    2829import com.l2jserver.gameserver.network.serverpackets.ShowTownMap; 
    2930import com.l2jserver.gameserver.network.serverpackets.StaticObject; 
    30 import com.l2jserver.gameserver.templates.chars.L2CharTemplate; 
    3131 
    3232/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2SymbolMakerInstance.java

    r5134 r5146  
    1717import com.l2jserver.gameserver.model.actor.L2Character; 
    1818import com.l2jserver.gameserver.model.actor.L2Npc; 
    19 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
     19import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    2020 
    2121public class L2SymbolMakerInstance extends L2Npc 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2TamedBeastInstance.java

    r5083 r5146  
    2626import com.l2jserver.gameserver.datatables.SkillTable; 
    2727import com.l2jserver.gameserver.model.L2Object; 
    28 import com.l2jserver.gameserver.model.L2Skill; 
    2928import com.l2jserver.gameserver.model.actor.L2Character; 
    30 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     29import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
     30import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
     31import com.l2jserver.gameserver.model.skills.L2Skill; 
     32import com.l2jserver.gameserver.model.skills.L2SkillType; 
    3133import com.l2jserver.gameserver.network.serverpackets.AbstractNpcInfo; 
    3234import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 
    … …  
    3638import com.l2jserver.gameserver.network.serverpackets.StopMove; 
    3739import com.l2jserver.gameserver.network.serverpackets.ValidateLocation; 
    38 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    39 import com.l2jserver.gameserver.templates.skills.L2SkillType; 
    4040import com.l2jserver.gameserver.util.Point3D; 
    4141import com.l2jserver.util.Rnd; 
    … …  
    376376         * @param target  
    377377         * 
    378          * @see com.l2jserver.gameserver.model.actor.L2Character#doCast(com.l2jserver.gameserver.model.L2Skill) 
     378         * @see com.l2jserver.gameserver.model.actor.L2Character#doCast(com.l2jserver.gameserver.model.skills.L2Skill) 
    379379         */ 
    380380        protected void sitCastAndFollow(L2Skill skill, L2Character target) 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2TeleporterInstance.java

    r5093 r5146  
    2727import com.l2jserver.gameserver.model.actor.L2Character; 
    2828import com.l2jserver.gameserver.model.actor.L2Npc; 
     29import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    2930import com.l2jserver.gameserver.network.SystemMessageId; 
    3031import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 
    3132import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage; 
    32 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    3333 
    3434 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2TerrainObjectInstance.java

    r5098 r5146  
    1616 
    1717import com.l2jserver.gameserver.model.actor.L2Npc; 
     18import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    1819import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 
    19 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    2020 
    2121public final class L2TerrainObjectInstance extends L2Npc 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2TerritoryWardInstance.java

    r4777 r5146  
    1717import com.l2jserver.gameserver.ai.CtrlIntention; 
    1818import com.l2jserver.gameserver.instancemanager.TerritoryWarManager; 
    19 import com.l2jserver.gameserver.model.L2Skill; 
    2019import com.l2jserver.gameserver.model.actor.L2Attackable; 
    2120import com.l2jserver.gameserver.model.actor.L2Character; 
     21import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
     22import com.l2jserver.gameserver.model.skills.L2Skill; 
    2223import com.l2jserver.gameserver.network.SystemMessageId; 
    2324import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 
    … …  
    2627import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    2728import com.l2jserver.gameserver.network.serverpackets.ValidateLocation; 
    28 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    2929 
    3030public final class L2TerritoryWardInstance extends L2Attackable 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2TotemInstance.java

    r5121 r5146  
    2020import com.l2jserver.gameserver.datatables.SkillTable; 
    2121import com.l2jserver.gameserver.model.L2Object; 
    22 import com.l2jserver.gameserver.model.L2Skill; 
    2322import com.l2jserver.gameserver.model.actor.L2Character; 
    2423import com.l2jserver.gameserver.model.actor.L2Npc; 
     24import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
     25import com.l2jserver.gameserver.model.skills.L2Skill; 
    2526import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 
    26 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    2727 
    2828/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2TownPetInstance.java

    r4981 r5146  
    2020import com.l2jserver.gameserver.model.L2CharPosition; 
    2121import com.l2jserver.gameserver.model.actor.L2Npc; 
     22import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    2223import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 
    2324import com.l2jserver.gameserver.network.serverpackets.MyTargetSelected; 
    2425import com.l2jserver.gameserver.network.serverpackets.ValidateLocation; 
    25 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    2626import com.l2jserver.util.Rnd; 
    2727 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2TrainerHealersInstance.java

    r4918 r5146  
    2222import com.l2jserver.gameserver.datatables.SkillTable; 
    2323import com.l2jserver.gameserver.datatables.SkillTreesData; 
    24 import com.l2jserver.gameserver.model.L2Skill; 
    2524import com.l2jserver.gameserver.model.L2SkillLearn; 
     25import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
     26import com.l2jserver.gameserver.model.skills.L2Skill; 
    2627import com.l2jserver.gameserver.network.SystemMessageId; 
    2728import com.l2jserver.gameserver.network.serverpackets.AcquireSkillList; 
    2829import com.l2jserver.gameserver.network.serverpackets.AcquireSkillList.SkillType; 
    2930import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage; 
    30 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    3131 
    3232/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2TrainerInstance.java

    r4662 r5146  
    1515package com.l2jserver.gameserver.model.actor.instance; 
    1616 
    17 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
     17import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    1818 
    1919public class L2TrainerInstance extends L2NpcInstance 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2TransformManagerInstance.java

    r5083 r5146  
    2222import com.l2jserver.gameserver.datatables.SkillTreesData; 
    2323import com.l2jserver.gameserver.instancemanager.QuestManager; 
    24 import com.l2jserver.gameserver.model.L2Skill; 
    2524import com.l2jserver.gameserver.model.L2SkillLearn; 
    26 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     25import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
     26import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    2727import com.l2jserver.gameserver.model.quest.QuestState; 
     28import com.l2jserver.gameserver.model.skills.L2Skill; 
    2829import com.l2jserver.gameserver.network.SystemMessageId; 
    2930import com.l2jserver.gameserver.network.serverpackets.AcquireSkillList; 
    … …  
    3132import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage; 
    3233import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    33 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    3434import com.l2jserver.gameserver.util.Util; 
    3535 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2TrapInstance.java

    r4921 r5146  
    1919import javolution.util.FastList; 
    2020 
    21 import com.l2jserver.gameserver.model.L2Skill; 
    2221import com.l2jserver.gameserver.model.actor.L2Attackable; 
    2322import com.l2jserver.gameserver.model.actor.L2Character; 
    2423import com.l2jserver.gameserver.model.actor.L2Trap; 
     24import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    2525import com.l2jserver.gameserver.model.olympiad.OlympiadGameManager; 
    2626import com.l2jserver.gameserver.model.quest.Quest; 
    2727import com.l2jserver.gameserver.model.quest.Quest.TrapAction; 
     28import com.l2jserver.gameserver.model.skills.L2Skill; 
    2829import com.l2jserver.gameserver.network.SystemMessageId; 
    2930import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    30 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    3131 
    3232public class L2TrapInstance extends L2Trap 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2TvTEventNpcInstance.java

    r4417 r5146  
    1818import com.l2jserver.gameserver.cache.HtmCache; 
    1919import com.l2jserver.gameserver.model.actor.L2Npc; 
     20import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    2021import com.l2jserver.gameserver.model.entity.TvTEvent; 
    2122import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 
    2223import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage; 
    23 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    2424 
    2525public class L2TvTEventNpcInstance extends L2Npc 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2VillageMasterDElfInstance.java

    r4417 r5146  
    1515package com.l2jserver.gameserver.model.actor.instance; 
    1616 
     17import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    1718import com.l2jserver.gameserver.model.base.PlayerClass; 
    1819import com.l2jserver.gameserver.model.base.Race; 
    19 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    2020 
    2121public final class L2VillageMasterDElfInstance extends L2VillageMasterInstance 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2VillageMasterDwarfInstance.java

    r4417 r5146  
    1515package com.l2jserver.gameserver.model.actor.instance; 
    1616 
     17import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    1718import com.l2jserver.gameserver.model.base.PlayerClass; 
    1819import com.l2jserver.gameserver.model.base.Race; 
    19 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    2020 
    2121public final class L2VillageMasterDwarfInstance extends L2VillageMasterInstance 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2VillageMasterFighterInstance.java

    r4417 r5146  
    1515package com.l2jserver.gameserver.model.actor.instance; 
    1616 
     17import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    1718import com.l2jserver.gameserver.model.base.ClassType; 
    1819import com.l2jserver.gameserver.model.base.PlayerClass; 
    1920import com.l2jserver.gameserver.model.base.Race; 
    20 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    2121 
    2222public final class L2VillageMasterFighterInstance extends L2VillageMasterInstance 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2VillageMasterInstance.java

    r5127 r5146  
    3535import com.l2jserver.gameserver.model.L2ClanMember; 
    3636import com.l2jserver.gameserver.model.L2SkillLearn; 
     37import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    3738import com.l2jserver.gameserver.model.base.ClassId; 
    3839import com.l2jserver.gameserver.model.base.PlayerClass; 
    … …  
    5253import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    5354import com.l2jserver.gameserver.network.serverpackets.UserInfo; 
    54 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    5555import com.l2jserver.gameserver.util.Util; 
    5656import com.l2jserver.util.StringUtil; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2VillageMasterKamaelInstance.java

    r4426 r5146  
    1616 
    1717import com.l2jserver.Config; 
     18import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    1819import com.l2jserver.gameserver.model.base.PlayerClass; 
    1920import com.l2jserver.gameserver.model.base.Race; 
    2021import com.l2jserver.gameserver.model.quest.QuestState; 
    21 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    2222 
    2323public final class L2VillageMasterKamaelInstance extends L2VillageMasterInstance 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2VillageMasterMysticInstance.java

    r4417 r5146  
    1515package com.l2jserver.gameserver.model.actor.instance; 
    1616 
     17import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    1718import com.l2jserver.gameserver.model.base.ClassType; 
    1819import com.l2jserver.gameserver.model.base.PlayerClass; 
    1920import com.l2jserver.gameserver.model.base.Race; 
    20 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    2121 
    2222public final class L2VillageMasterMysticInstance extends L2VillageMasterInstance 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2VillageMasterOrcInstance.java

    r4417 r5146  
    1515package com.l2jserver.gameserver.model.actor.instance; 
    1616 
     17import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    1718import com.l2jserver.gameserver.model.base.PlayerClass; 
    1819import com.l2jserver.gameserver.model.base.Race; 
    19 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    2020 
    2121public final class L2VillageMasterOrcInstance extends L2VillageMasterInstance 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2VillageMasterPriestInstance.java

    r4417 r5146  
    1515package com.l2jserver.gameserver.model.actor.instance; 
    1616 
     17import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    1718import com.l2jserver.gameserver.model.base.ClassType; 
    1819import com.l2jserver.gameserver.model.base.PlayerClass; 
    1920import com.l2jserver.gameserver.model.base.Race; 
    20 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    2121 
    2222public final class L2VillageMasterPriestInstance extends L2VillageMasterInstance 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2WarehouseInstance.java

    r4921 r5146  
    1515package com.l2jserver.gameserver.model.actor.instance; 
    1616 
    17 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
     17import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    1818 
    1919 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2WeddingManagerInstance.java

    r5083 r5146  
    1919import com.l2jserver.gameserver.datatables.SkillTable; 
    2020import com.l2jserver.gameserver.instancemanager.CoupleManager; 
    21 import com.l2jserver.gameserver.model.L2Skill; 
    2221import com.l2jserver.gameserver.model.L2World; 
    2322import com.l2jserver.gameserver.model.actor.L2Npc; 
     23import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    2424import com.l2jserver.gameserver.model.entity.Couple; 
    25 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     25import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
     26import com.l2jserver.gameserver.model.skills.L2Skill; 
    2627import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse; 
    2728import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage; 
    28 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    2929 
    3030/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2WyvernManagerInstance.java

    r4904 r5146  
    1717import com.l2jserver.gameserver.model.L2Clan; 
    1818import com.l2jserver.gameserver.model.actor.L2Npc; 
     19import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    1920import com.l2jserver.gameserver.model.entity.ClanHall; 
    2021import com.l2jserver.gameserver.model.entity.clanhall.SiegableHall; 
    2122import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 
    2223import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage; 
    23 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    2424 
    2525public class L2WyvernManagerInstance extends L2Npc 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2XmassTreeInstance.java

    r5013 r5146  
    2121import com.l2jserver.gameserver.datatables.SkillTable; 
    2222import com.l2jserver.gameserver.model.L2Object; 
    23 import com.l2jserver.gameserver.model.L2Skill; 
    2423import com.l2jserver.gameserver.model.actor.L2Character; 
    2524import com.l2jserver.gameserver.model.actor.L2Npc; 
     25import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
     26import com.l2jserver.gameserver.model.skills.L2Skill; 
    2627import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 
    27 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    2828 
    2929/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/stat/CharStat.java

    r5083 r5146  
    1717import com.l2jserver.Config; 
    1818import com.l2jserver.gameserver.model.Elementals; 
    19 import com.l2jserver.gameserver.model.L2Skill; 
    2019import com.l2jserver.gameserver.model.actor.L2Character; 
    21 import com.l2jserver.gameserver.model.item.L2Weapon; 
    22 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    23 import com.l2jserver.gameserver.model.item.type.L2WeaponType; 
    24 import com.l2jserver.gameserver.skills.Calculator; 
    25 import com.l2jserver.gameserver.skills.Env; 
    26 import com.l2jserver.gameserver.skills.Stats; 
     20import com.l2jserver.gameserver.model.items.L2Weapon; 
     21import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
     22import com.l2jserver.gameserver.model.items.type.L2WeaponType; 
     23import com.l2jserver.gameserver.model.skills.L2Skill; 
     24import com.l2jserver.gameserver.model.stats.Calculator; 
     25import com.l2jserver.gameserver.model.stats.Env; 
     26import com.l2jserver.gameserver.model.stats.Stats; 
    2727 
    2828public class CharStat 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/stat/NpcStat.java

    r5013 r5146  
    1616 
    1717import com.l2jserver.gameserver.model.actor.L2Npc; 
    18 import com.l2jserver.gameserver.skills.Stats; 
     18import com.l2jserver.gameserver.model.stats.Stats; 
    1919 
    2020public class NpcStat extends CharStat 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/stat/PcStat.java

    r5093 r5146  
    2424import com.l2jserver.gameserver.model.entity.RecoBonus; 
    2525import com.l2jserver.gameserver.model.quest.QuestState; 
     26import com.l2jserver.gameserver.model.stats.Stats; 
    2627import com.l2jserver.gameserver.network.SystemMessageId; 
    2728import com.l2jserver.gameserver.network.serverpackets.ExBrExtraUserInfo; 
    … …  
    3334import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    3435import com.l2jserver.gameserver.network.serverpackets.UserInfo; 
    35 import com.l2jserver.gameserver.skills.Stats; 
    3636 
    3737public class PcStat extends PlayableStat 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/stat/PetStat.java

    r5058 r5146  
    1717import com.l2jserver.gameserver.datatables.ExperienceTable; 
    1818import com.l2jserver.gameserver.datatables.PetDataTable; 
    19 import com.l2jserver.gameserver.model.L2Skill; 
    2019import com.l2jserver.gameserver.model.actor.L2Character; 
    2120import com.l2jserver.gameserver.model.actor.instance.L2PetInstance; 
     21import com.l2jserver.gameserver.model.skills.L2Skill; 
     22import com.l2jserver.gameserver.model.stats.Stats; 
    2223import com.l2jserver.gameserver.network.SystemMessageId; 
    2324import com.l2jserver.gameserver.network.serverpackets.SocialAction; 
    2425import com.l2jserver.gameserver.network.serverpackets.StatusUpdate; 
    2526import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    26 import com.l2jserver.gameserver.skills.Stats; 
    2727 
    2828public class PetStat extends SummonStat 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/status/CharStatus.java

    r4981 r5146  
    2727import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    2828import com.l2jserver.gameserver.model.actor.stat.CharStat; 
    29 import com.l2jserver.gameserver.skills.Formulas; 
     29import com.l2jserver.gameserver.model.stats.Formulas; 
    3030import com.l2jserver.util.Rnd; 
    3131 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/status/PcStatus.java

    r5093 r5146  
    2222import com.l2jserver.gameserver.model.actor.L2Summon; 
    2323import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    24 import com.l2jserver.gameserver.model.actor.instance.L2SummonInstance; 
     24import com.l2jserver.gameserver.model.actor.instance.L2ServitorInstance; 
    2525import com.l2jserver.gameserver.model.actor.stat.PcStat; 
    2626import com.l2jserver.gameserver.model.entity.Duel; 
    2727import com.l2jserver.gameserver.model.quest.QuestState; 
     28import com.l2jserver.gameserver.model.stats.Formulas; 
     29import com.l2jserver.gameserver.model.stats.Stats; 
    2830import com.l2jserver.gameserver.network.SystemMessageId; 
    2931import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 
    3032import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    31 import com.l2jserver.gameserver.skills.Formulas; 
    32 import com.l2jserver.gameserver.skills.Stats; 
    3333import com.l2jserver.gameserver.util.Util; 
    3434import com.l2jserver.util.Rnd; 
    … …  
    121121                        // Check and calculate transfered damage 
    122122                        final L2Summon summon = getActiveChar().getPet(); 
    123                         if (summon != null && summon instanceof L2SummonInstance && Util.checkIfInRange(1000, getActiveChar(), summon, true)) 
     123                        if (summon != null && summon instanceof L2ServitorInstance && Util.checkIfInRange(1000, getActiveChar(), summon, true)) 
    124124                        { 
    125125                                tDmg = (int)value * (int)getActiveChar().getStat().calcStat(Stats.TRANSFER_DAMAGE_PERCENT, 0, null, null) /100; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/status/SummonStatus.java

    r4562 r5146  
    2020import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    2121import com.l2jserver.gameserver.model.entity.Duel; 
    22 import com.l2jserver.gameserver.skills.Stats; 
     22import com.l2jserver.gameserver.model.stats.Stats; 
    2323import com.l2jserver.gameserver.util.Util; 
    2424 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/templates/L2CharTemplate.java

    r5112 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.templates.chars; 
     15package com.l2jserver.gameserver.model.actor.templates; 
    1616 
    1717import com.l2jserver.gameserver.model.StatsSet; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/templates/L2NpcTemplate.java

    r5112 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.templates.chars; 
     15package com.l2jserver.gameserver.model.actor.templates; 
    1616 
    1717import gnu.trove.map.hash.TIntObjectHashMap; 
    … …  
    2929import com.l2jserver.gameserver.model.L2MinionData; 
    3030import com.l2jserver.gameserver.model.L2NpcAIData; 
    31 import com.l2jserver.gameserver.model.L2Skill; 
    3231import com.l2jserver.gameserver.model.StatsSet; 
    3332import com.l2jserver.gameserver.model.actor.instance.L2XmassTreeInstance; 
    … …  
    3534import com.l2jserver.gameserver.model.quest.Quest; 
    3635import com.l2jserver.gameserver.model.quest.Quest.QuestEventType; 
     36import com.l2jserver.gameserver.model.skills.L2Skill; 
    3737 
    3838/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/templates/L2PcTemplate.java

    r5112 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.templates.chars; 
     15package com.l2jserver.gameserver.model.actor.templates; 
    1616 
    1717import java.util.List; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/Condition.java

    r5134 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.conditions; 
     15package com.l2jserver.gameserver.model.conditions; 
    1616 
    17 import com.l2jserver.gameserver.skills.Env; 
     17import com.l2jserver.gameserver.model.stats.Env; 
    1818 
    1919/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionChangeWeapon.java

    r5112 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.conditions; 
     15package com.l2jserver.gameserver.model.conditions; 
    1616 
    1717import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    18 import com.l2jserver.gameserver.model.item.L2Weapon; 
    19 import com.l2jserver.gameserver.skills.Env; 
     18import com.l2jserver.gameserver.model.items.L2Weapon; 
     19import com.l2jserver.gameserver.model.stats.Env; 
    2020 
    2121/** 
    … …  
    4343         * @param env the env 
    4444         * @return true, if successful 
    45          * @see com.l2jserver.gameserver.skills.conditions.Condition#testImpl(com.l2jserver.gameserver.skills.Env) 
     45         * @see com.l2jserver.gameserver.model.conditions.Condition#testImpl(com.l2jserver.gameserver.model.stats.Env) 
    4646         */ 
    4747        @Override 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionForceBuff.java

    r5112 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.conditions; 
     15package com.l2jserver.gameserver.model.conditions; 
    1616 
    17 import com.l2jserver.gameserver.model.L2Effect; 
    18 import com.l2jserver.gameserver.skills.Env; 
     17import com.l2jserver.gameserver.model.effects.L2Effect; 
     18import com.l2jserver.gameserver.model.stats.Env; 
    1919 
    2020/** 
    … …  
    4646         * @param env the env 
    4747         * @return true, if successful 
    48          * @see com.l2jserver.gameserver.skills.conditions.Condition#testImpl(com.l2jserver.gameserver.skills.Env) 
     48         * @see com.l2jserver.gameserver.model.conditions.Condition#testImpl(com.l2jserver.gameserver.model.stats.Env) 
    4949         */ 
    5050        @Override 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionGameChance.java

    r5112 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.conditions; 
     15package com.l2jserver.gameserver.model.conditions; 
    1616 
    17 import com.l2jserver.gameserver.skills.Env; 
     17import com.l2jserver.gameserver.model.stats.Env; 
    1818import com.l2jserver.util.Rnd; 
    1919 
    … …  
    4242         * @param env the env 
    4343         * @return true, if successful 
    44          * @see com.l2jserver.gameserver.skills.conditions.Condition#testImpl(com.l2jserver.gameserver.skills.Env) 
     44         * @see com.l2jserver.gameserver.model.conditions.Condition#testImpl(com.l2jserver.gameserver.model.stats.Env) 
    4545         */ 
    4646        @Override 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionGameTime.java

    r5112 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.conditions; 
     15package com.l2jserver.gameserver.model.conditions; 
    1616 
    1717import com.l2jserver.gameserver.GameTimeController; 
    18 import com.l2jserver.gameserver.skills.Env; 
     18import com.l2jserver.gameserver.model.stats.Env; 
    1919 
    2020/** 
    … …  
    5454         * @param env the env 
    5555         * @return true, if successful 
    56          * @see com.l2jserver.gameserver.skills.conditions.Condition#testImpl(com.l2jserver.gameserver.skills.Env) 
     56         * @see com.l2jserver.gameserver.model.conditions.Condition#testImpl(com.l2jserver.gameserver.model.stats.Env) 
    5757         */ 
    5858        @Override 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionInventory.java

    r5112 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.conditions; 
     15package com.l2jserver.gameserver.model.conditions; 
    1616 
    17 import com.l2jserver.gameserver.skills.Env; 
     17import com.l2jserver.gameserver.model.stats.Env; 
    1818 
    1919/** 
    … …  
    4242         * @param env the env 
    4343         * @return true, if successful 
    44          * @see com.l2jserver.gameserver.skills.conditions.Condition#testImpl(com.l2jserver.gameserver.skills.Env) 
     44         * @see com.l2jserver.gameserver.model.conditions.Condition#testImpl(com.l2jserver.gameserver.model.stats.Env) 
    4545         */ 
    4646        @Override 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionItemId.java

    r5112 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.conditions; 
     15package com.l2jserver.gameserver.model.conditions; 
    1616 
    17 import com.l2jserver.gameserver.skills.Env; 
     17import com.l2jserver.gameserver.model.stats.Env; 
    1818 
    1919/** 
    … …  
    4242         * @param env the env 
    4343         * @return true, if successful 
    44          * @see com.l2jserver.gameserver.skills.conditions.Condition#testImpl(com.l2jserver.gameserver.skills.Env) 
     44         * @see com.l2jserver.gameserver.model.conditions.Condition#testImpl(com.l2jserver.gameserver.model.stats.Env) 
    4545         */ 
    4646        @Override 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionListener.java

    r5112 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.conditions; 
     15package com.l2jserver.gameserver.model.conditions; 
    1616 
    1717/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionLogicAnd.java

    r5112 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.conditions; 
     15package com.l2jserver.gameserver.model.conditions; 
    1616 
    17 import com.l2jserver.gameserver.skills.Env; 
     17import com.l2jserver.gameserver.model.stats.Env; 
    1818 
    1919/** 
    … …  
    5858         * 
    5959         * @param listener the new listener 
    60          * @see com.l2jserver.gameserver.skills.conditions.Condition#setListener(com.l2jserver.gameserver.skills.conditions.ConditionListener) 
     60         * @see com.l2jserver.gameserver.model.conditions.Condition#setListener(com.l2jserver.gameserver.model.conditions.ConditionListener) 
    6161         */ 
    6262        @Override 
    … …  
    8181         * @param env the env 
    8282         * @return true, if successful 
    83          * @see com.l2jserver.gameserver.skills.conditions.Condition#testImpl(com.l2jserver.gameserver.skills.Env) 
     83         * @see com.l2jserver.gameserver.model.conditions.Condition#testImpl(com.l2jserver.gameserver.model.stats.Env) 
    8484         */ 
    8585        @Override 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionLogicNot.java

    r5112 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.conditions; 
     15package com.l2jserver.gameserver.model.conditions; 
    1616 
    17 import com.l2jserver.gameserver.skills.Env; 
     17import com.l2jserver.gameserver.model.stats.Env; 
    1818 
    1919/** 
    … …  
    4343         * 
    4444         * @param listener the new listener 
    45          * @see com.l2jserver.gameserver.skills.conditions.Condition#setListener(com.l2jserver.gameserver.skills.conditions.ConditionListener) 
     45         * @see com.l2jserver.gameserver.model.conditions.Condition#setListener(com.l2jserver.gameserver.model.conditions.ConditionListener) 
    4646         */ 
    4747        @Override 
    … …  
    6060         * @param env the env 
    6161         * @return true, if successful 
    62          * @see com.l2jserver.gameserver.skills.conditions.Condition#testImpl(com.l2jserver.gameserver.skills.Env) 
     62         * @see com.l2jserver.gameserver.model.conditions.Condition#testImpl(com.l2jserver.gameserver.model.stats.Env) 
    6363         */ 
    6464        @Override 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionLogicOr.java

    r5112 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.conditions; 
     15package com.l2jserver.gameserver.model.conditions; 
    1616 
    17 import com.l2jserver.gameserver.skills.Env; 
     17import com.l2jserver.gameserver.model.stats.Env; 
    1818 
    1919/** 
    … …  
    5050         * 
    5151         * @param listener the new listener 
    52          * @see com.l2jserver.gameserver.skills.conditions.Condition#setListener(com.l2jserver.gameserver.skills.conditions.ConditionListener) 
     52         * @see com.l2jserver.gameserver.model.conditions.Condition#setListener(com.l2jserver.gameserver.model.conditions.ConditionListener) 
    5353         */ 
    5454        @Override 
    … …  
    7373         * @param env the env 
    7474         * @return true, if successful 
    75          * @see com.l2jserver.gameserver.skills.conditions.Condition#testImpl(com.l2jserver.gameserver.skills.Env) 
     75         * @see com.l2jserver.gameserver.model.conditions.Condition#testImpl(com.l2jserver.gameserver.model.stats.Env) 
    7676         */ 
    7777        @Override 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionMinDistance.java

    r5134 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.conditions; 
     15package com.l2jserver.gameserver.model.conditions; 
    1616 
    17 import com.l2jserver.gameserver.skills.Env; 
     17import com.l2jserver.gameserver.model.stats.Env; 
    1818 
    1919/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionPetType.java

    r5134 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.conditions; 
     15package com.l2jserver.gameserver.model.conditions; 
    1616 
    1717import com.l2jserver.gameserver.datatables.PetDataTable; 
    1818import com.l2jserver.gameserver.model.actor.L2Summon; 
    1919import com.l2jserver.gameserver.model.actor.instance.L2PetInstance; 
    20 import com.l2jserver.gameserver.model.item.L2Item; 
    21 import com.l2jserver.gameserver.skills.Env; 
     20import com.l2jserver.gameserver.model.items.L2Item; 
     21import com.l2jserver.gameserver.model.stats.Env; 
    2222 
    2323/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerActiveEffectId.java

    r5134 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.conditions; 
     15package com.l2jserver.gameserver.model.conditions; 
    1616 
    17 import com.l2jserver.gameserver.model.L2Effect; 
    18 import com.l2jserver.gameserver.skills.Env; 
     17import com.l2jserver.gameserver.model.effects.L2Effect; 
     18import com.l2jserver.gameserver.model.stats.Env; 
    1919 
    2020/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerActiveSkillId.java

    r5134 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.conditions; 
     15package com.l2jserver.gameserver.model.conditions; 
    1616 
    17 import com.l2jserver.gameserver.model.L2Skill; 
    18 import com.l2jserver.gameserver.skills.Env; 
     17import com.l2jserver.gameserver.model.skills.L2Skill; 
     18import com.l2jserver.gameserver.model.stats.Env; 
    1919 
    2020/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerAgathionId.java

    r5134 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.conditions; 
     15package com.l2jserver.gameserver.model.conditions; 
    1616 
    1717import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    18 import com.l2jserver.gameserver.skills.Env; 
     18import com.l2jserver.gameserver.model.stats.Env; 
    1919 
    2020/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerBaseStats.java

    r5112 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.conditions; 
     15package com.l2jserver.gameserver.model.conditions; 
    1616 
    1717import com.l2jserver.gameserver.model.actor.L2Character; 
    1818import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    19 import com.l2jserver.gameserver.skills.Env; 
     19import com.l2jserver.gameserver.model.stats.Env; 
    2020 
    2121/** 
    … …  
    4949         * @param env the env 
    5050         * @return true, if successful 
    51          * @see com.l2jserver.gameserver.skills.conditions.Condition#testImpl(com.l2jserver.gameserver.skills.Env) 
     51         * @see com.l2jserver.gameserver.model.conditions.Condition#testImpl(com.l2jserver.gameserver.model.stats.Env) 
    5252         */ 
    5353        @Override 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerCanSweep.java

    r5112 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.conditions; 
     15package com.l2jserver.gameserver.model.conditions; 
    1616 
    1717import com.l2jserver.gameserver.model.L2Object; 
    18 import com.l2jserver.gameserver.model.L2Skill; 
    1918import com.l2jserver.gameserver.model.actor.L2Attackable; 
    2019import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     20import com.l2jserver.gameserver.model.skills.L2Skill; 
     21import com.l2jserver.gameserver.model.stats.Env; 
    2122import com.l2jserver.gameserver.network.SystemMessageId; 
    22 import com.l2jserver.gameserver.skills.Env; 
    2323 
    2424/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerCharges.java

    r5134 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.conditions; 
     15package com.l2jserver.gameserver.model.conditions; 
    1616 
    1717import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    18 import com.l2jserver.gameserver.skills.Env; 
     18import com.l2jserver.gameserver.model.stats.Env; 
    1919 
    2020/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java

    r5134 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.conditions; 
     15package com.l2jserver.gameserver.model.conditions; 
    1616 
    1717import java.util.ArrayList; 
    1818 
    1919import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    20 import com.l2jserver.gameserver.skills.Env; 
     20import com.l2jserver.gameserver.model.stats.Env; 
    2121 
    2222/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerCloakStatus.java

    r5134 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.conditions; 
     15package com.l2jserver.gameserver.model.conditions; 
    1616 
    1717import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    18 import com.l2jserver.gameserver.skills.Env; 
     18import com.l2jserver.gameserver.model.stats.Env; 
    1919 
    2020/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerCp.java

    r5134 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.conditions; 
     15package com.l2jserver.gameserver.model.conditions; 
    1616 
    17 import com.l2jserver.gameserver.skills.Env; 
     17import com.l2jserver.gameserver.model.stats.Env; 
    1818 
    1919/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerFlyMounted.java

    r5134 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.conditions; 
     15package com.l2jserver.gameserver.model.conditions; 
    1616 
    1717import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    18 import com.l2jserver.gameserver.skills.Env; 
     18import com.l2jserver.gameserver.model.stats.Env; 
    1919 
    2020/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerGrade.java

    r5112 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.conditions; 
     15package com.l2jserver.gameserver.model.conditions; 
    1616 
    1717import java.util.logging.Logger; 
    1818 
    1919import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    20 import com.l2jserver.gameserver.skills.Env; 
     20import com.l2jserver.gameserver.model.stats.Env; 
    2121 
    2222/** 
    … …  
    4949         
    5050        /** 
    51          * @see com.l2jserver.gameserver.skills.conditions.Condition#testImpl(com.l2jserver.gameserver.skills.Env) 
     51         * @see com.l2jserver.gameserver.model.conditions.Condition#testImpl(com.l2jserver.gameserver.model.stats.Env) 
    5252         */ 
    5353        @Override 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerHasCastle.java

    r5112 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.conditions; 
     15package com.l2jserver.gameserver.model.conditions; 
    1616 
    1717import com.l2jserver.gameserver.model.L2Clan; 
    1818import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    19 import com.l2jserver.gameserver.skills.Env; 
     19import com.l2jserver.gameserver.model.stats.Env; 
    2020 
    2121/** 
    … …  
    4444         * @param env the env 
    4545         * @return true, if successful 
    46          * @see com.l2jserver.gameserver.skills.conditions.Condition#testImpl(com.l2jserver.gameserver.skills.Env) 
     46         * @see com.l2jserver.gameserver.model.conditions.Condition#testImpl(com.l2jserver.gameserver.model.stats.Env) 
    4747         */ 
    4848        @Override 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerHasClanHall.java

    r5112 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.conditions; 
     15package com.l2jserver.gameserver.model.conditions; 
    1616 
    1717import java.util.ArrayList; 
    … …  
    1919import com.l2jserver.gameserver.model.L2Clan; 
    2020import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    21 import com.l2jserver.gameserver.skills.Env; 
     21import com.l2jserver.gameserver.model.stats.Env; 
    2222 
    2323/** 
    … …  
    4545         * @param env the env 
    4646         * @return true, if successful 
    47          * @see com.l2jserver.gameserver.skills.conditions.Condition#testImpl(com.l2jserver.gameserver.skills.Env) 
     47         * @see com.l2jserver.gameserver.model.conditions.Condition#testImpl(com.l2jserver.gameserver.model.stats.Env) 
    4848         */ 
    4949        @Override 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerHasFort.java

    r5112 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.conditions; 
     15package com.l2jserver.gameserver.model.conditions; 
    1616 
    1717import com.l2jserver.gameserver.model.L2Clan; 
    1818import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    19 import com.l2jserver.gameserver.skills.Env; 
     19import com.l2jserver.gameserver.model.stats.Env; 
    2020 
    2121/** 
    … …  
    4444         * @param env the env 
    4545         * @return true, if successful 
    46          * @see com.l2jserver.gameserver.skills.conditions.Condition#testImpl(com.l2jserver.gameserver.skills.Env) 
     46         * @see com.l2jserver.gameserver.model.conditions.Condition#testImpl(com.l2jserver.gameserver.model.stats.Env) 
    4747         */ 
    4848        @Override 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerHasPet.java

    r5134 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.conditions; 
     15package com.l2jserver.gameserver.model.conditions; 
    1616 
    1717import java.util.ArrayList; 
    … …  
    1919import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    2020import com.l2jserver.gameserver.model.actor.instance.L2PetInstance; 
    21 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    22 import com.l2jserver.gameserver.skills.Env; 
     21import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
     22import com.l2jserver.gameserver.model.stats.Env; 
    2323 
    2424/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerHp.java

    r5134 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.conditions; 
     15package com.l2jserver.gameserver.model.conditions; 
    1616 
    17 import com.l2jserver.gameserver.skills.Env; 
     17import com.l2jserver.gameserver.model.stats.Env; 
    1818 
    1919/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerInsideZoneId.java

    r5112 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.conditions; 
     15package com.l2jserver.gameserver.model.conditions; 
    1616 
    1717import java.util.ArrayList; 
    … …  
    1919import com.l2jserver.gameserver.instancemanager.ZoneManager; 
    2020import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     21import com.l2jserver.gameserver.model.stats.Env; 
    2122import com.l2jserver.gameserver.model.zone.L2ZoneType; 
    22 import com.l2jserver.gameserver.skills.Env; 
    2323 
    2424/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerInstanceId.java

    r5134 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.conditions; 
     15package com.l2jserver.gameserver.model.conditions; 
    1616 
    1717import java.util.ArrayList; 
    … …  
    2020import com.l2jserver.gameserver.instancemanager.InstanceManager.InstanceWorld; 
    2121import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    22 import com.l2jserver.gameserver.skills.Env; 
     22import com.l2jserver.gameserver.model.stats.Env; 
    2323 
    2424/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerInvSize.java

    r5134 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.conditions; 
     15package com.l2jserver.gameserver.model.conditions; 
    1616 
    1717import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    18 import com.l2jserver.gameserver.skills.Env; 
     18import com.l2jserver.gameserver.model.stats.Env; 
    1919 
    2020 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerIsClanLeader.java

    r5134 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.conditions; 
     15package com.l2jserver.gameserver.model.conditions; 
    1616 
    1717import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    18 import com.l2jserver.gameserver.skills.Env; 
     18import com.l2jserver.gameserver.model.stats.Env; 
    1919 
    2020/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerIsHero.java

    r5134 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.conditions; 
     15package com.l2jserver.gameserver.model.conditions; 
    1616 
    1717import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    18 import com.l2jserver.gameserver.skills.Env; 
     18import com.l2jserver.gameserver.model.stats.Env; 
    1919 
    2020/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerLandingZone.java

    r5134 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.conditions; 
     15package com.l2jserver.gameserver.model.conditions; 
    1616 
    1717import com.l2jserver.gameserver.model.actor.L2Character; 
    18 import com.l2jserver.gameserver.skills.Env; 
     18import com.l2jserver.gameserver.model.stats.Env; 
    1919 
    2020/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerLevel.java

    r5134 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.conditions; 
     15package com.l2jserver.gameserver.model.conditions; 
    1616 
    17 import com.l2jserver.gameserver.skills.Env; 
     17import com.l2jserver.gameserver.model.stats.Env; 
    1818 
    1919/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerLevelRange.java

    r5112 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.conditions; 
     15package com.l2jserver.gameserver.model.conditions; 
    1616 
    17 import com.l2jserver.gameserver.skills.Env; 
     17import com.l2jserver.gameserver.model.stats.Env; 
    1818 
    1919/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerMp.java

    r5134 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.conditions; 
     15package com.l2jserver.gameserver.model.conditions; 
    1616 
    17 import com.l2jserver.gameserver.skills.Env; 
     17import com.l2jserver.gameserver.model.stats.Env; 
    1818 
    1919/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerPkCount.java

    r5134 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.conditions; 
     15package com.l2jserver.gameserver.model.conditions; 
    1616 
    1717import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    18 import com.l2jserver.gameserver.skills.Env; 
     18import com.l2jserver.gameserver.model.stats.Env; 
    1919 
    2020/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerPledgeClass.java

    r5112 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.conditions; 
     15package com.l2jserver.gameserver.model.conditions; 
    1616 
    1717import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    18 import com.l2jserver.gameserver.skills.Env; 
     18import com.l2jserver.gameserver.model.stats.Env; 
    1919 
    2020/** 
    … …  
    4343         * @param env the env 
    4444         * @return true, if successful 
    45          * @see com.l2jserver.gameserver.skills.conditions.Condition#testImpl(com.l2jserver.gameserver.skills.Env) 
     45         * @see com.l2jserver.gameserver.model.conditions.Condition#testImpl(com.l2jserver.gameserver.model.stats.Env) 
    4646         */ 
    4747        @Override 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerRace.java

    r5112 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.conditions; 
     15package com.l2jserver.gameserver.model.conditions; 
    1616 
    1717import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    1818import com.l2jserver.gameserver.model.base.Race; 
    19 import com.l2jserver.gameserver.skills.Env; 
     19import com.l2jserver.gameserver.model.stats.Env; 
    2020import com.l2jserver.gameserver.util.Util; 
    2121 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java

    r5112 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.conditions; 
     15package com.l2jserver.gameserver.model.conditions; 
    1616 
    1717import com.l2jserver.gameserver.model.actor.L2Character; 
    1818import com.l2jserver.gameserver.model.actor.L2Npc; 
    19 import com.l2jserver.gameserver.skills.Env; 
     19import com.l2jserver.gameserver.model.stats.Env; 
    2020 
    2121/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerServitorNpcId.java

    r5134 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.conditions; 
     15package com.l2jserver.gameserver.model.conditions; 
    1616 
    1717import java.util.ArrayList; 
    1818 
    1919import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    20 import com.l2jserver.gameserver.skills.Env; 
     20import com.l2jserver.gameserver.model.stats.Env; 
    2121 
    2222/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerSex.java

    r5134 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.conditions; 
     15package com.l2jserver.gameserver.model.conditions; 
    1616 
    1717import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    18 import com.l2jserver.gameserver.skills.Env; 
     18import com.l2jserver.gameserver.model.stats.Env; 
    1919 
    2020/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerSiegeSide.java

    r5134 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.conditions; 
     15package com.l2jserver.gameserver.model.conditions; 
    1616 
    1717import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    18 import com.l2jserver.gameserver.skills.Env; 
     18import com.l2jserver.gameserver.model.stats.Env; 
    1919 
    2020/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerSouls.java

    r5134 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.conditions; 
     15package com.l2jserver.gameserver.model.conditions; 
    1616 
    1717import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    18 import com.l2jserver.gameserver.skills.Env; 
     18import com.l2jserver.gameserver.model.stats.Env; 
    1919 
    2020/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerState.java

    r5112 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.conditions; 
     15package com.l2jserver.gameserver.model.conditions; 
    1616 
    1717import com.l2jserver.gameserver.model.actor.L2Character; 
    1818import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    1919import com.l2jserver.gameserver.model.base.PlayerState; 
    20 import com.l2jserver.gameserver.skills.Env; 
     20import com.l2jserver.gameserver.model.stats.Env; 
    2121 
    2222/** 
    … …  
    4141         
    4242        /** 
    43          * @see com.l2jserver.gameserver.skills.conditions.Condition#testImpl(com.l2jserver.gameserver.skills.Env) 
     43         * @see com.l2jserver.gameserver.model.conditions.Condition#testImpl(com.l2jserver.gameserver.model.stats.Env) 
    4444         */ 
    4545        @Override 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerSubclass.java

    r5134 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.conditions; 
     15package com.l2jserver.gameserver.model.conditions; 
    1616 
    1717import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    18 import com.l2jserver.gameserver.skills.Env; 
     18import com.l2jserver.gameserver.model.stats.Env; 
    1919 
    2020/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerTransformationId.java

    r5112 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.conditions; 
     15package com.l2jserver.gameserver.model.conditions; 
    1616 
    1717import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    18 import com.l2jserver.gameserver.skills.Env; 
     18import com.l2jserver.gameserver.model.stats.Env; 
    1919 
    2020/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerTvTEvent.java

    r5134 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.conditions; 
     15package com.l2jserver.gameserver.model.conditions; 
    1616 
    1717import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    1818import com.l2jserver.gameserver.model.entity.TvTEvent; 
    19 import com.l2jserver.gameserver.skills.Env; 
     19import com.l2jserver.gameserver.model.stats.Env; 
    2020 
    2121/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerVehicleMounted.java

    r5134 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.conditions; 
     15package com.l2jserver.gameserver.model.conditions; 
    1616 
    1717import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    18 import com.l2jserver.gameserver.skills.Env; 
     18import com.l2jserver.gameserver.model.stats.Env; 
    1919 
    2020/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerWeight.java

    r5134 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.conditions; 
     15package com.l2jserver.gameserver.model.conditions; 
    1616 
    1717import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    18 import com.l2jserver.gameserver.skills.Env; 
    19 import com.l2jserver.gameserver.skills.Stats; 
     18import com.l2jserver.gameserver.model.stats.Env; 
     19import com.l2jserver.gameserver.model.stats.Stats; 
    2020 
    2121 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionSiegeZone.java

    r5134 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.conditions; 
     15package com.l2jserver.gameserver.model.conditions; 
    1616 
    1717import com.l2jserver.gameserver.instancemanager.CastleManager; 
    … …  
    2222import com.l2jserver.gameserver.model.entity.Castle; 
    2323import com.l2jserver.gameserver.model.entity.Fort; 
    24 import com.l2jserver.gameserver.skills.Env; 
     24import com.l2jserver.gameserver.model.stats.Env; 
    2525 
    2626/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionSkillStats.java

    r5134 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.conditions; 
     15package com.l2jserver.gameserver.model.conditions; 
    1616 
    17 import com.l2jserver.gameserver.skills.Env; 
    18 import com.l2jserver.gameserver.skills.Stats; 
     17import com.l2jserver.gameserver.model.stats.Env; 
     18import com.l2jserver.gameserver.model.stats.Stats; 
    1919 
    2020/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionSlotItemId.java

    r5134 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.conditions; 
     15package com.l2jserver.gameserver.model.conditions; 
    1616 
    1717import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    18 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    1918import com.l2jserver.gameserver.model.itemcontainer.Inventory; 
    20 import com.l2jserver.gameserver.skills.Env; 
     19import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
     20import com.l2jserver.gameserver.model.stats.Env; 
    2121 
    2222/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionSlotItemType.java

    r5134 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.conditions; 
     15package com.l2jserver.gameserver.model.conditions; 
    1616 
    1717import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    18 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    1918import com.l2jserver.gameserver.model.itemcontainer.Inventory; 
    20 import com.l2jserver.gameserver.skills.Env; 
     19import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
     20import com.l2jserver.gameserver.model.stats.Env; 
    2121 
    2222/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionTargetAbnormal.java

    r5134 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.conditions; 
     15package com.l2jserver.gameserver.model.conditions; 
    1616 
    17 import com.l2jserver.gameserver.skills.Env; 
     17import com.l2jserver.gameserver.model.stats.Env; 
    1818 
    1919/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionTargetActiveEffectId.java

    r5134 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.conditions; 
     15package com.l2jserver.gameserver.model.conditions; 
    1616 
    17 import com.l2jserver.gameserver.model.L2Effect; 
    18 import com.l2jserver.gameserver.skills.Env; 
     17import com.l2jserver.gameserver.model.effects.L2Effect; 
     18import com.l2jserver.gameserver.model.stats.Env; 
    1919 
    2020/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionTargetActiveSkillId.java

    r5134 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.conditions; 
     15package com.l2jserver.gameserver.model.conditions; 
    1616 
    17 import com.l2jserver.gameserver.model.L2Skill; 
    18 import com.l2jserver.gameserver.skills.Env; 
     17import com.l2jserver.gameserver.model.skills.L2Skill; 
     18import com.l2jserver.gameserver.model.stats.Env; 
    1919 
    2020/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionTargetAggro.java

    r5134 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.conditions; 
     15package com.l2jserver.gameserver.model.conditions; 
    1616 
    1717import com.l2jserver.gameserver.model.actor.L2Character; 
    1818import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance; 
    1919import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    20 import com.l2jserver.gameserver.skills.Env; 
     20import com.l2jserver.gameserver.model.stats.Env; 
    2121 
    2222/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionTargetBodyPart.java

    r5134 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.conditions; 
     15package com.l2jserver.gameserver.model.conditions; 
    1616 
    17 import com.l2jserver.gameserver.model.item.L2Armor; 
    18 import com.l2jserver.gameserver.model.item.L2Item; 
    1917import com.l2jserver.gameserver.model.itemcontainer.Inventory; 
    20 import com.l2jserver.gameserver.skills.Env; 
     18import com.l2jserver.gameserver.model.items.L2Armor; 
     19import com.l2jserver.gameserver.model.items.L2Item; 
     20import com.l2jserver.gameserver.model.stats.Env; 
    2121 
    2222/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionTargetClassIdRestriction.java

    r5134 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.conditions; 
     15package com.l2jserver.gameserver.model.conditions; 
    1616 
    1717import java.util.ArrayList; 
    1818 
    1919import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    20 import com.l2jserver.gameserver.skills.Env; 
     20import com.l2jserver.gameserver.model.stats.Env; 
    2121 
    2222/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionTargetLevel.java

    r5134 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.conditions; 
     15package com.l2jserver.gameserver.model.conditions; 
    1616 
    17 import com.l2jserver.gameserver.skills.Env; 
     17import com.l2jserver.gameserver.model.stats.Env; 
    1818 
    1919/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionTargetNone.java

    r5134 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.conditions; 
     15package com.l2jserver.gameserver.model.conditions; 
    1616 
    17 import com.l2jserver.gameserver.skills.Env; 
     17import com.l2jserver.gameserver.model.stats.Env; 
    1818 
    1919/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionTargetNpcId.java

    r5134 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.conditions; 
     15package com.l2jserver.gameserver.model.conditions; 
    1616 
    1717import java.util.ArrayList; 
    … …  
    1919import com.l2jserver.gameserver.model.actor.L2Npc; 
    2020import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance; 
    21 import com.l2jserver.gameserver.skills.Env; 
     21import com.l2jserver.gameserver.model.stats.Env; 
    2222 
    2323 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionTargetNpcType.java

    r5134 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.conditions; 
     15package com.l2jserver.gameserver.model.conditions; 
    1616 
    1717import com.l2jserver.gameserver.model.L2Object.InstanceType; 
    18 import com.l2jserver.gameserver.skills.Env; 
     18import com.l2jserver.gameserver.model.stats.Env; 
    1919 
    2020 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionTargetPlayable.java

    r5134 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.conditions; 
     15package com.l2jserver.gameserver.model.conditions; 
    1616 
    1717import com.l2jserver.gameserver.model.actor.L2Playable; 
    18 import com.l2jserver.gameserver.skills.Env; 
     18import com.l2jserver.gameserver.model.stats.Env; 
    1919 
    2020/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionTargetRace.java

    r5112 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.conditions; 
     15package com.l2jserver.gameserver.model.conditions; 
    1616 
    1717import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    1818import com.l2jserver.gameserver.model.base.Race; 
    19 import com.l2jserver.gameserver.skills.Env; 
     19import com.l2jserver.gameserver.model.stats.Env; 
    2020import com.l2jserver.gameserver.util.Util; 
    2121 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionTargetRaceId.java

    r5134 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.conditions; 
     15package com.l2jserver.gameserver.model.conditions; 
    1616 
    1717import java.util.ArrayList; 
    1818 
    1919import com.l2jserver.gameserver.model.actor.L2Npc; 
    20 import com.l2jserver.gameserver.skills.Env; 
     20import com.l2jserver.gameserver.model.stats.Env; 
    2121 
    2222 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java

    r5134 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.conditions; 
     15package com.l2jserver.gameserver.model.conditions; 
    1616 
    17 import com.l2jserver.gameserver.model.item.L2Weapon; 
    18 import com.l2jserver.gameserver.skills.Env; 
     17import com.l2jserver.gameserver.model.items.L2Weapon; 
     18import com.l2jserver.gameserver.model.stats.Env; 
    1919 
    2020/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionUsingItemType.java

    r5134 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.conditions; 
     15package com.l2jserver.gameserver.model.conditions; 
    1616 
    1717import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    18 import com.l2jserver.gameserver.model.item.L2Item; 
    19 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    20 import com.l2jserver.gameserver.model.item.type.L2ArmorType; 
    2118import com.l2jserver.gameserver.model.itemcontainer.Inventory; 
    22 import com.l2jserver.gameserver.skills.Env; 
     19import com.l2jserver.gameserver.model.items.L2Item; 
     20import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
     21import com.l2jserver.gameserver.model.items.type.L2ArmorType; 
     22import com.l2jserver.gameserver.model.stats.Env; 
    2323 
    2424/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionUsingSkill.java

    r5134 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.conditions; 
     15package com.l2jserver.gameserver.model.conditions; 
    1616 
    17 import com.l2jserver.gameserver.skills.Env; 
     17import com.l2jserver.gameserver.model.stats.Env; 
    1818 
    1919/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionWithSkill.java

    r5134 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.conditions; 
     15package com.l2jserver.gameserver.model.conditions; 
    1616 
    17 import com.l2jserver.gameserver.skills.Env; 
     17import com.l2jserver.gameserver.model.stats.Env; 
    1818 
    1919/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/effects/AbnormalEffect.java

    r5112 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills; 
     15package com.l2jserver.gameserver.model.effects; 
    1616 
    1717import java.util.NoSuchElementException; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/effects/EffectTemplate.java

    r5112 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.templates.effects; 
     15package com.l2jserver.gameserver.model.effects; 
    1616 
    1717import java.lang.reflect.Constructor; 
    … …  
    2222import com.l2jserver.gameserver.handler.EffectHandler; 
    2323import com.l2jserver.gameserver.model.ChanceCondition; 
    24 import com.l2jserver.gameserver.model.L2Effect; 
    25 import com.l2jserver.gameserver.skills.AbnormalEffect; 
    26 import com.l2jserver.gameserver.skills.Env; 
    27 import com.l2jserver.gameserver.skills.conditions.Condition; 
    28 import com.l2jserver.gameserver.skills.funcs.FuncTemplate; 
    29 import com.l2jserver.gameserver.skills.funcs.Lambda; 
    30 import com.l2jserver.gameserver.templates.skills.L2SkillType; 
     24import com.l2jserver.gameserver.model.conditions.Condition; 
     25import com.l2jserver.gameserver.model.skills.L2SkillType; 
     26import com.l2jserver.gameserver.model.skills.funcs.FuncTemplate; 
     27import com.l2jserver.gameserver.model.skills.funcs.Lambda; 
     28import com.l2jserver.gameserver.model.stats.Env; 
    3129 
    3230 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/effects/L2Effect.java

    r5112 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.model; 
     15package com.l2jserver.gameserver.model.effects; 
    1616 
    1717import java.util.ArrayList; 
    … …  
    2424import com.l2jserver.gameserver.ThreadPoolManager; 
    2525import com.l2jserver.gameserver.datatables.SkillTable; 
     26import com.l2jserver.gameserver.model.ChanceCondition; 
     27import com.l2jserver.gameserver.model.IChanceSkillTrigger; 
    2628import com.l2jserver.gameserver.model.actor.L2Character; 
    2729import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    28 import com.l2jserver.gameserver.model.actor.instance.L2SummonInstance; 
     30import com.l2jserver.gameserver.model.actor.instance.L2ServitorInstance; 
     31import com.l2jserver.gameserver.model.skills.L2Skill; 
     32import com.l2jserver.gameserver.model.skills.L2SkillType; 
     33import com.l2jserver.gameserver.model.skills.funcs.Func; 
     34import com.l2jserver.gameserver.model.skills.funcs.FuncTemplate; 
     35import com.l2jserver.gameserver.model.skills.funcs.Lambda; 
     36import com.l2jserver.gameserver.model.stats.Env; 
    2937import com.l2jserver.gameserver.network.SystemMessageId; 
    3038import com.l2jserver.gameserver.network.serverpackets.AbnormalStatusUpdate; 
    … …  
    3442import com.l2jserver.gameserver.network.serverpackets.PartySpelled; 
    3543import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    36 import com.l2jserver.gameserver.skills.AbnormalEffect; 
    37 import com.l2jserver.gameserver.skills.Env; 
    38 import com.l2jserver.gameserver.skills.funcs.Func; 
    39 import com.l2jserver.gameserver.skills.funcs.FuncTemplate; 
    40 import com.l2jserver.gameserver.skills.funcs.Lambda; 
    41 import com.l2jserver.gameserver.templates.effects.EffectTemplate; 
    42 import com.l2jserver.gameserver.templates.skills.L2EffectType; 
    43 import com.l2jserver.gameserver.templates.skills.L2SkillType; 
    4444 
    4545/** 
    … …  
    5151{ 
    5252        protected static final Logger _log = Logger.getLogger(L2Effect.class.getName()); 
    53          
    54         public static enum EffectState 
    55         { 
    56                 CREATED, 
    57                 ACTING, 
    58                 FINISHING 
    59         } 
    6053         
    6154        private static final Func[] _emptyFunctionSet = new Func[0]; 
    … …  
    174167                if ((_skill.getId() > 2277 && _skill.getId() < 2286) || (_skill.getId() >= 2512 && _skill.getId() <= 2514)) 
    175168                { 
    176                         if (_effected instanceof L2SummonInstance || 
    177                                         (_effected instanceof L2PcInstance && ((L2PcInstance) _effected).getPet() instanceof L2SummonInstance)) 
     169                        if (_effected instanceof L2ServitorInstance || 
     170                                        (_effected instanceof L2PcInstance && ((L2PcInstance) _effected).getPet() instanceof L2ServitorInstance)) 
    178171                        { 
    179172                                temp /= 2; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/effects/L2EffectType.java

    r5112 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.templates.skills; 
     15package com.l2jserver.gameserver.model.effects; 
    1616 
    1717/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/BlockCheckerEngine.java

    r5140 r5146  
    3030import com.l2jserver.gameserver.instancemanager.HandysBlockCheckerManager; 
    3131import com.l2jserver.gameserver.instancemanager.HandysBlockCheckerManager.ArenaParticipantsHolder; 
    32 import com.l2jserver.gameserver.model.L2Skill; 
    3332import com.l2jserver.gameserver.model.L2Spawn; 
    3433import com.l2jserver.gameserver.model.L2World; 
    … …  
    3635import com.l2jserver.gameserver.model.actor.instance.L2BlockInstance; 
    3736import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    38 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     37import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    3938import com.l2jserver.gameserver.model.itemcontainer.PcInventory; 
     39import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
     40import com.l2jserver.gameserver.model.skills.L2Skill; 
    4041import com.l2jserver.gameserver.network.SystemMessageId; 
    4142import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 
    … …  
    4748import com.l2jserver.gameserver.network.serverpackets.RelationChanged; 
    4849import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    49 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    5050import com.l2jserver.util.Rnd; 
    5151 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/Castle.java

    r4994 r5146  
    5050import com.l2jserver.gameserver.model.L2Manor; 
    5151import com.l2jserver.gameserver.model.L2Object; 
    52 import com.l2jserver.gameserver.model.L2Skill; 
    5352import com.l2jserver.gameserver.model.L2SkillLearn; 
    5453import com.l2jserver.gameserver.model.actor.instance.L2ArtefactInstance; 
    … …  
    5655import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    5756import com.l2jserver.gameserver.model.itemcontainer.PcInventory; 
     57import com.l2jserver.gameserver.model.skills.L2Skill; 
    5858import com.l2jserver.gameserver.model.zone.type.L2CastleZone; 
    5959import com.l2jserver.gameserver.model.zone.type.L2ResidenceTeleportZone; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/Duel.java

    r5058 r5146  
    2424import com.l2jserver.gameserver.ai.CtrlIntention; 
    2525import com.l2jserver.gameserver.instancemanager.DuelManager; 
    26 import com.l2jserver.gameserver.model.L2Effect; 
    2726import com.l2jserver.gameserver.model.actor.L2Character; 
    2827import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     28import com.l2jserver.gameserver.model.effects.L2Effect; 
    2929import com.l2jserver.gameserver.network.SystemMessageId; 
    3030import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/Fort.java

    r5145 r5146  
    4747import com.l2jserver.gameserver.model.L2Clan; 
    4848import com.l2jserver.gameserver.model.L2Object; 
    49 import com.l2jserver.gameserver.model.L2Skill; 
    5049import com.l2jserver.gameserver.model.L2SkillLearn; 
    5150import com.l2jserver.gameserver.model.L2Spawn; 
    … …  
    5453import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    5554import com.l2jserver.gameserver.model.actor.instance.L2StaticObjectInstance; 
     55import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    5656import com.l2jserver.gameserver.model.itemcontainer.PcInventory; 
     57import com.l2jserver.gameserver.model.skills.L2Skill; 
    5758import com.l2jserver.gameserver.model.zone.type.L2FortZone; 
    5859import com.l2jserver.gameserver.model.zone.type.L2SiegeZone; 
    … …  
    6162import com.l2jserver.gameserver.network.serverpackets.PledgeShowInfoUpdate; 
    6263import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    63 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    6464 
    6565public class Fort 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/FortSiege.java

    r5134 r5146  
    4646import com.l2jserver.gameserver.model.actor.instance.L2FortCommanderInstance; 
    4747import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     48import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    4849import com.l2jserver.gameserver.network.NpcStringId; 
    4950import com.l2jserver.gameserver.network.SystemMessageId; 
    5051import com.l2jserver.gameserver.network.serverpackets.NpcSay; 
    5152import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    52 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    5353 
    5454public class FortSiege implements Siegable 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/Hero.java

    r5145 r5146  
    4949import com.l2jserver.gameserver.model.StatsSet; 
    5050import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    51 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     51import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    5252import com.l2jserver.gameserver.model.itemcontainer.Inventory; 
     53import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    5354import com.l2jserver.gameserver.model.olympiad.Olympiad; 
    5455import com.l2jserver.gameserver.network.SystemMessageId; 
    … …  
    5859import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    5960import com.l2jserver.gameserver.network.serverpackets.UserInfo; 
    60 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    6161import com.l2jserver.util.StringUtil; 
    6262 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/Instance.java

    r4981 r5146  
    3333import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance; 
    3434import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     35import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    3536import com.l2jserver.gameserver.network.SystemMessageId; 
    3637import com.l2jserver.gameserver.network.clientpackets.Say2; 
    … …  
    3839import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket; 
    3940import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    40 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    4141 
    4242 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/L2Event.java

    r5140 r5146  
    3737import com.l2jserver.gameserver.model.L2World; 
    3838import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     39import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    3940import com.l2jserver.gameserver.network.serverpackets.CharInfo; 
    4041import com.l2jserver.gameserver.network.serverpackets.ExBrExtraUserInfo; 
    … …  
    4243import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage; 
    4344import com.l2jserver.gameserver.network.serverpackets.UserInfo; 
    44 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    4545import com.l2jserver.gameserver.util.PlayerEventStatus; 
    4646import com.l2jserver.util.ValueSortMap; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/Siege.java

    r5145 r5146  
    4949import com.l2jserver.gameserver.model.actor.instance.L2FlameTowerInstance; 
    5050import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     51import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    5152import com.l2jserver.gameserver.network.SystemMessageId; 
    5253import com.l2jserver.gameserver.network.serverpackets.ExBrExtraUserInfo; 
    … …  
    5556import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    5657import com.l2jserver.gameserver.network.serverpackets.UserInfo; 
    57 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    5858 
    5959public class Siege implements Siegable 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/TvTEvent.java

    r4921 r5146  
    3232import com.l2jserver.gameserver.instancemanager.AntiFeedManager; 
    3333import com.l2jserver.gameserver.instancemanager.InstanceManager; 
    34 import com.l2jserver.gameserver.model.L2Skill; 
    3534import com.l2jserver.gameserver.model.L2Spawn; 
    3635import com.l2jserver.gameserver.model.actor.L2Character; 
    … …  
    4039import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    4140import com.l2jserver.gameserver.model.actor.instance.L2PetInstance; 
    42 import com.l2jserver.gameserver.model.actor.instance.L2SummonInstance; 
     41import com.l2jserver.gameserver.model.actor.instance.L2ServitorInstance; 
     42import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    4343import com.l2jserver.gameserver.model.itemcontainer.PcInventory; 
    4444import com.l2jserver.gameserver.model.olympiad.OlympiadManager; 
     45import com.l2jserver.gameserver.model.skills.L2Skill; 
    4546import com.l2jserver.gameserver.network.SystemMessageId; 
    4647import com.l2jserver.gameserver.network.clientpackets.Say2; 
    … …  
    5051import com.l2jserver.gameserver.network.serverpackets.StatusUpdate; 
    5152import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    52 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    5353import com.l2jserver.util.Rnd; 
    5454import com.l2jserver.util.StringUtil; 
    … …  
    863863                L2PcInstance killerPlayerInstance = null; 
    864864                 
    865                 if (killerCharacter instanceof L2PetInstance || killerCharacter instanceof L2SummonInstance) 
     865                if (killerCharacter instanceof L2PetInstance || killerCharacter instanceof L2ServitorInstance) 
    866866                { 
    867867                        killerPlayerInstance = ((L2Summon) killerCharacter).getOwner(); 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/clanhall/ClanHallSiegeEngine.java

    r5140 r5146  
    4242import com.l2jserver.gameserver.model.actor.L2Npc; 
    4343import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     44import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    4445import com.l2jserver.gameserver.model.entity.Siegable; 
    4546import com.l2jserver.gameserver.model.quest.Quest; 
    … …  
    4849import com.l2jserver.gameserver.network.serverpackets.NpcSay; 
    4950import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    50 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    5151 
    5252/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/holders/ItemHolder.java

    r5112 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.model; 
     15package com.l2jserver.gameserver.model.holders; 
    1616 
    1717/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/holders/SkillHolder.java

    r5112 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills; 
     15package com.l2jserver.gameserver.model.holders; 
    1616 
    1717import com.l2jserver.gameserver.datatables.SkillTable; 
    18 import com.l2jserver.gameserver.model.L2Skill; 
     18import com.l2jserver.gameserver.model.skills.L2Skill; 
    1919 
    2020/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/itemauction/AuctionItem.java

    r5083 r5146  
    1818import com.l2jserver.gameserver.model.L2Augmentation; 
    1919import com.l2jserver.gameserver.model.StatsSet; 
    20 import com.l2jserver.gameserver.model.item.L2Item; 
    21 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     20import com.l2jserver.gameserver.model.items.L2Item; 
     21import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    2222 
    2323/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/itemauction/ItemAuction.java

    r5093 r5146  
    3030import com.l2jserver.gameserver.model.L2World; 
    3131import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    32 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     32import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    3333import com.l2jserver.gameserver.network.SystemMessageId; 
    3434import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/itemauction/ItemAuctionInstance.java

    r5093 r5146  
    4343import com.l2jserver.gameserver.model.StatsSet; 
    4444import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    45 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    46 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance.ItemLocation; 
     45import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
     46import com.l2jserver.gameserver.model.items.instance.L2ItemInstance.ItemLocation; 
    4747import com.l2jserver.gameserver.network.SystemMessageId; 
    4848import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/itemcontainer/Inventory.java

    r5145 r5146  
    3030import com.l2jserver.gameserver.datatables.SkillTable; 
    3131import com.l2jserver.gameserver.model.L2ArmorSet; 
    32 import com.l2jserver.gameserver.model.L2Skill; 
    3332import com.l2jserver.gameserver.model.L2World; 
    3433import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    35 import com.l2jserver.gameserver.model.item.L2Armor; 
    36 import com.l2jserver.gameserver.model.item.L2Item; 
    37 import com.l2jserver.gameserver.model.item.L2Weapon; 
    38 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    39 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance.ItemLocation; 
    40 import com.l2jserver.gameserver.model.item.type.L2EtcItemType; 
    41 import com.l2jserver.gameserver.model.item.type.L2WeaponType; 
     34import com.l2jserver.gameserver.model.holders.SkillHolder; 
     35import com.l2jserver.gameserver.model.items.L2Armor; 
     36import com.l2jserver.gameserver.model.items.L2Item; 
     37import com.l2jserver.gameserver.model.items.L2Weapon; 
     38import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
     39import com.l2jserver.gameserver.model.items.instance.L2ItemInstance.ItemLocation; 
     40import com.l2jserver.gameserver.model.items.type.L2EtcItemType; 
     41import com.l2jserver.gameserver.model.items.type.L2WeaponType; 
     42import com.l2jserver.gameserver.model.skills.L2Skill; 
     43import com.l2jserver.gameserver.model.stats.Stats; 
    4244import com.l2jserver.gameserver.network.serverpackets.SkillCoolTime; 
    43 import com.l2jserver.gameserver.skills.SkillHolder; 
    44 import com.l2jserver.gameserver.skills.Stats; 
    4545import com.l2jserver.util.StringUtil; 
    4646 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/itemcontainer/ItemContainer.java

    r5083 r5146  
    3232import com.l2jserver.gameserver.model.actor.L2Character; 
    3333import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    34 import com.l2jserver.gameserver.model.item.L2Item; 
    35 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    36 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance.ItemLocation; 
     34import com.l2jserver.gameserver.model.items.L2Item; 
     35import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
     36import com.l2jserver.gameserver.model.items.instance.L2ItemInstance.ItemLocation; 
    3737 
    3838/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/itemcontainer/Mail.java

    r5083 r5146  
    2323import com.l2jserver.gameserver.model.L2World; 
    2424import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    25 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    26 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance.ItemLocation; 
     25import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
     26import com.l2jserver.gameserver.model.items.instance.L2ItemInstance.ItemLocation; 
    2727 
    2828/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/itemcontainer/PcFreight.java

    r5134 r5146  
    2121import com.l2jserver.Config; 
    2222import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    23 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    24 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance.ItemLocation; 
    25 import com.l2jserver.gameserver.skills.Stats; 
     23import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
     24import com.l2jserver.gameserver.model.items.instance.L2ItemInstance.ItemLocation; 
     25import com.l2jserver.gameserver.model.stats.Stats; 
    2626 
    2727public class PcFreight extends ItemContainer 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/itemcontainer/PcInventory.java

    r5083 r5146  
    2828import com.l2jserver.gameserver.model.TradeList; 
    2929import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    30 import com.l2jserver.gameserver.model.item.L2Item; 
    31 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    32 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance.ItemLocation; 
    33 import com.l2jserver.gameserver.model.item.type.L2EtcItemType; 
     30import com.l2jserver.gameserver.model.items.L2Item; 
     31import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
     32import com.l2jserver.gameserver.model.items.instance.L2ItemInstance.ItemLocation; 
     33import com.l2jserver.gameserver.model.items.type.L2EtcItemType; 
    3434import com.l2jserver.gameserver.network.SystemMessageId; 
    3535import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/itemcontainer/PcRefund.java

    r5083 r5146  
    1919import com.l2jserver.gameserver.datatables.ItemTable; 
    2020import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    21 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    22 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance.ItemLocation; 
     21import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
     22import com.l2jserver.gameserver.model.items.instance.L2ItemInstance.ItemLocation; 
    2323 
    2424/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/itemcontainer/PcWarehouse.java

    r5083 r5146  
    1616 
    1717import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    18 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance.ItemLocation; 
     18import com.l2jserver.gameserver.model.items.instance.L2ItemInstance.ItemLocation; 
    1919 
    2020public class PcWarehouse extends Warehouse 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/itemcontainer/PetInventory.java

    r5083 r5146  
    1717import com.l2jserver.gameserver.datatables.ItemTable; 
    1818import com.l2jserver.gameserver.model.actor.instance.L2PetInstance; 
    19 import com.l2jserver.gameserver.model.item.L2Item; 
    20 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    21 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance.ItemLocation; 
    22 import com.l2jserver.gameserver.model.item.type.L2EtcItemType; 
     19import com.l2jserver.gameserver.model.items.L2Item; 
     20import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
     21import com.l2jserver.gameserver.model.items.instance.L2ItemInstance.ItemLocation; 
     22import com.l2jserver.gameserver.model.items.type.L2EtcItemType; 
    2323 
    2424public class PetInventory extends Inventory 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/items/L2Armor.java

    r5145 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.model.item; 
     15package com.l2jserver.gameserver.model.items; 
    1616 
    1717import java.util.ArrayList; 
    1818 
    19 import com.l2jserver.gameserver.model.L2Skill; 
    2019import com.l2jserver.gameserver.model.StatsSet; 
    2120import com.l2jserver.gameserver.model.actor.L2Character; 
    22 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    23 import com.l2jserver.gameserver.model.item.type.L2ArmorType; 
    24 import com.l2jserver.gameserver.skills.Env; 
    25 import com.l2jserver.gameserver.skills.SkillHolder; 
    26 import com.l2jserver.gameserver.skills.funcs.Func; 
    27 import com.l2jserver.gameserver.skills.funcs.FuncTemplate; 
     21import com.l2jserver.gameserver.model.holders.SkillHolder; 
     22import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
     23import com.l2jserver.gameserver.model.items.type.L2ArmorType; 
     24import com.l2jserver.gameserver.model.skills.L2Skill; 
     25import com.l2jserver.gameserver.model.skills.funcs.Func; 
     26import com.l2jserver.gameserver.model.skills.funcs.FuncTemplate; 
     27import com.l2jserver.gameserver.model.stats.Env; 
    2828import com.l2jserver.util.StringUtil; 
    2929 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/items/L2EtcItem.java

    r5145 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.model.item; 
     15package com.l2jserver.gameserver.model.items; 
    1616 
    1717import java.util.ArrayList; 
    … …  
    2020import com.l2jserver.gameserver.model.L2ExtractableProduct; 
    2121import com.l2jserver.gameserver.model.StatsSet; 
    22 import com.l2jserver.gameserver.model.item.type.L2EtcItemType; 
    2322import com.l2jserver.gameserver.model.itemcontainer.PcInventory; 
     23import com.l2jserver.gameserver.model.items.type.L2EtcItemType; 
    2424import com.l2jserver.util.StringUtil; 
    2525 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/items/L2Henna.java

    r5145 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.model.item; 
     15package com.l2jserver.gameserver.model.items; 
    1616 
    1717import com.l2jserver.gameserver.model.StatsSet; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/items/L2Item.java

    r5145 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.model.item; 
     15package com.l2jserver.gameserver.model.items; 
    1616 
    1717import java.util.ArrayList; 
    … …  
    2525import com.l2jserver.gameserver.datatables.ItemTable; 
    2626import com.l2jserver.gameserver.model.Elementals; 
    27 import com.l2jserver.gameserver.model.L2Effect; 
    2827import com.l2jserver.gameserver.model.L2Object; 
    2928import com.l2jserver.gameserver.model.StatsSet; 
    … …  
    3130import com.l2jserver.gameserver.model.actor.L2Summon; 
    3231import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    33 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    34 import com.l2jserver.gameserver.model.item.type.L2ActionType; 
    35 import com.l2jserver.gameserver.model.item.type.L2EtcItemType; 
    36 import com.l2jserver.gameserver.model.item.type.L2ItemType; 
     32import com.l2jserver.gameserver.model.conditions.Condition; 
     33import com.l2jserver.gameserver.model.conditions.ConditionLogicOr; 
     34import com.l2jserver.gameserver.model.conditions.ConditionPetType; 
     35import com.l2jserver.gameserver.model.effects.EffectTemplate; 
     36import com.l2jserver.gameserver.model.effects.L2Effect; 
     37import com.l2jserver.gameserver.model.holders.SkillHolder; 
     38import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
     39import com.l2jserver.gameserver.model.items.type.L2ActionType; 
     40import com.l2jserver.gameserver.model.items.type.L2EtcItemType; 
     41import com.l2jserver.gameserver.model.items.type.L2ItemType; 
    3742import com.l2jserver.gameserver.model.quest.Quest; 
     43import com.l2jserver.gameserver.model.skills.funcs.Func; 
     44import com.l2jserver.gameserver.model.skills.funcs.FuncTemplate; 
     45import com.l2jserver.gameserver.model.stats.Env; 
    3846import com.l2jserver.gameserver.network.SystemMessageId; 
    3947import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    40 import com.l2jserver.gameserver.skills.Env; 
    41 import com.l2jserver.gameserver.skills.SkillHolder; 
    42 import com.l2jserver.gameserver.skills.conditions.Condition; 
    43 import com.l2jserver.gameserver.skills.conditions.ConditionLogicOr; 
    44 import com.l2jserver.gameserver.skills.conditions.ConditionPetType; 
    45 import com.l2jserver.gameserver.skills.funcs.Func; 
    46 import com.l2jserver.gameserver.skills.funcs.FuncTemplate; 
    47 import com.l2jserver.gameserver.templates.effects.EffectTemplate; 
    4848import com.l2jserver.util.StringUtil; 
    4949 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/items/L2WarehouseItem.java

    r5145 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.model.item; 
     15package com.l2jserver.gameserver.model.items; 
    1616 
    17 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    18 import com.l2jserver.gameserver.model.item.type.L2ItemType; 
     17import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
     18import com.l2jserver.gameserver.model.items.type.L2ItemType; 
    1919 
    2020/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/items/L2Weapon.java

    r5145 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.model.item; 
     15package com.l2jserver.gameserver.model.items; 
    1616 
    1717import java.util.ArrayList; 
    … …  
    2323import com.l2jserver.gameserver.handler.ISkillHandler; 
    2424import com.l2jserver.gameserver.handler.SkillHandler; 
    25 import com.l2jserver.gameserver.model.L2Effect; 
    2625import com.l2jserver.gameserver.model.L2Object; 
    27 import com.l2jserver.gameserver.model.L2Skill; 
    2826import com.l2jserver.gameserver.model.StatsSet; 
    2927import com.l2jserver.gameserver.model.actor.L2Character; 
    3028import com.l2jserver.gameserver.model.actor.L2Npc; 
    3129import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    32 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    33 import com.l2jserver.gameserver.model.item.type.L2WeaponType; 
     30import com.l2jserver.gameserver.model.conditions.Condition; 
     31import com.l2jserver.gameserver.model.conditions.ConditionGameChance; 
     32import com.l2jserver.gameserver.model.effects.L2Effect; 
     33import com.l2jserver.gameserver.model.holders.SkillHolder; 
     34import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
     35import com.l2jserver.gameserver.model.items.type.L2WeaponType; 
    3436import com.l2jserver.gameserver.model.quest.Quest; 
    35 import com.l2jserver.gameserver.skills.Env; 
    36 import com.l2jserver.gameserver.skills.Formulas; 
    37 import com.l2jserver.gameserver.skills.SkillHolder; 
    38 import com.l2jserver.gameserver.skills.conditions.Condition; 
    39 import com.l2jserver.gameserver.skills.conditions.ConditionGameChance; 
    40 import com.l2jserver.gameserver.skills.funcs.Func; 
    41 import com.l2jserver.gameserver.skills.funcs.FuncTemplate; 
    42 import com.l2jserver.gameserver.templates.skills.L2SkillType; 
     37import com.l2jserver.gameserver.model.skills.L2Skill; 
     38import com.l2jserver.gameserver.model.skills.L2SkillType; 
     39import com.l2jserver.gameserver.model.skills.funcs.Func; 
     40import com.l2jserver.gameserver.model.skills.funcs.FuncTemplate; 
     41import com.l2jserver.gameserver.model.stats.Env; 
     42import com.l2jserver.gameserver.model.stats.Formulas; 
    4343import com.l2jserver.util.StringUtil; 
    4444 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/items/instance/L2HennaInstance.java

    r5083 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.model.item.instance; 
     15package com.l2jserver.gameserver.model.items.instance; 
    1616 
    17 import com.l2jserver.gameserver.model.item.L2Henna; 
     17import com.l2jserver.gameserver.model.items.L2Henna; 
    1818 
    1919/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/items/instance/L2ItemInstance.java

    r5138 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.model.item.instance; 
     15package com.l2jserver.gameserver.model.items.instance; 
    1616 
    1717import static com.l2jserver.gameserver.model.itemcontainer.PcInventory.ADENA_ID; 
    … …  
    4545import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    4646import com.l2jserver.gameserver.model.actor.knownlist.NullKnownList; 
    47 import com.l2jserver.gameserver.model.item.L2Armor; 
    48 import com.l2jserver.gameserver.model.item.L2EtcItem; 
    49 import com.l2jserver.gameserver.model.item.L2Item; 
    50 import com.l2jserver.gameserver.model.item.L2Weapon; 
    51 import com.l2jserver.gameserver.model.item.type.L2EtcItemType; 
    52 import com.l2jserver.gameserver.model.item.type.L2ItemType; 
     47import com.l2jserver.gameserver.model.holders.SkillHolder; 
    5348import com.l2jserver.gameserver.model.itemcontainer.PcInventory; 
     49import com.l2jserver.gameserver.model.items.L2Armor; 
     50import com.l2jserver.gameserver.model.items.L2EtcItem; 
     51import com.l2jserver.gameserver.model.items.L2Item; 
     52import com.l2jserver.gameserver.model.items.L2Weapon; 
     53import com.l2jserver.gameserver.model.items.type.L2EtcItemType; 
     54import com.l2jserver.gameserver.model.items.type.L2ItemType; 
    5455import com.l2jserver.gameserver.model.quest.QuestState; 
     56import com.l2jserver.gameserver.model.skills.funcs.Func; 
    5557import com.l2jserver.gameserver.network.SystemMessageId; 
    5658import com.l2jserver.gameserver.network.serverpackets.DropItem; 
    … …  
    6062import com.l2jserver.gameserver.network.serverpackets.StatusUpdate; 
    6163import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    62 import com.l2jserver.gameserver.skills.SkillHolder; 
    63 import com.l2jserver.gameserver.skills.funcs.Func; 
    6464import com.l2jserver.gameserver.util.GMAudit; 
    6565 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/items/type/L2ActionType.java

    r5083 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.model.item.type; 
     15package com.l2jserver.gameserver.model.items.type; 
    1616 
    1717/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/items/type/L2ArmorType.java

    r5083 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.model.item.type; 
     15package com.l2jserver.gameserver.model.items.type; 
    1616 
    1717/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/items/type/L2EtcItemType.java

    r5083 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.model.item.type; 
     15package com.l2jserver.gameserver.model.items.type; 
    1616 
    1717/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/items/type/L2ItemType.java

    r5083 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.model.item.type; 
     15package com.l2jserver.gameserver.model.items.type; 
    1616 
    1717/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/items/type/L2WeaponType.java

    r5083 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.model.item.type; 
     15package com.l2jserver.gameserver.model.items.type; 
    1616 
    1717/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/multisell/Ingredient.java

    r5083 r5146  
    1616 
    1717import com.l2jserver.gameserver.datatables.ItemTable; 
    18 import com.l2jserver.gameserver.model.item.L2Armor; 
    19 import com.l2jserver.gameserver.model.item.L2Item; 
    20 import com.l2jserver.gameserver.model.item.L2Weapon; 
    21 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     18import com.l2jserver.gameserver.model.items.L2Armor; 
     19import com.l2jserver.gameserver.model.items.L2Item; 
     20import com.l2jserver.gameserver.model.items.L2Weapon; 
     21import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    2222 
    2323/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/multisell/ItemInfo.java

    r5083 r5146  
    1616 
    1717import com.l2jserver.gameserver.model.Elementals; 
    18 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     18import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    1919 
    2020/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/multisell/PreparedEntry.java

    r5083 r5146  
    1919import java.util.ArrayList; 
    2020 
    21 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     21import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    2222 
    2323/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/multisell/PreparedListContainer.java

    r5083 r5146  
    2121import com.l2jserver.gameserver.model.actor.L2Npc; 
    2222import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    23 import com.l2jserver.gameserver.model.item.L2Armor; 
    24 import com.l2jserver.gameserver.model.item.L2Weapon; 
    25 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     23import com.l2jserver.gameserver.model.items.L2Armor; 
     24import com.l2jserver.gameserver.model.items.L2Weapon; 
     25import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    2626 
    2727public class PreparedListContainer extends ListContainer 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/olympiad/AbstractOlympiadGame.java

    r5083 r5146  
    2828import com.l2jserver.gameserver.model.L2Party; 
    2929import com.l2jserver.gameserver.model.L2Party.messageType; 
    30 import com.l2jserver.gameserver.model.L2Skill; 
    3130import com.l2jserver.gameserver.model.Location; 
    3231import com.l2jserver.gameserver.model.actor.L2Character; 
    … …  
    3534import com.l2jserver.gameserver.model.actor.instance.L2PetInstance; 
    3635import com.l2jserver.gameserver.model.entity.TvTEvent; 
    37 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     36import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    3837import com.l2jserver.gameserver.model.quest.Quest; 
     38import com.l2jserver.gameserver.model.skills.L2Skill; 
    3939import com.l2jserver.gameserver.model.zone.type.L2OlympiadStadiumZone; 
    4040import com.l2jserver.gameserver.network.SystemMessageId; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/quest/Quest.java

    r5140 r5146  
    3737import com.l2jserver.gameserver.model.L2Object; 
    3838import com.l2jserver.gameserver.model.L2Party; 
    39 import com.l2jserver.gameserver.model.L2Skill; 
    4039import com.l2jserver.gameserver.model.L2Spawn; 
    4140import com.l2jserver.gameserver.model.Location; 
    … …  
    4645import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    4746import com.l2jserver.gameserver.model.actor.instance.L2TrapInstance; 
    48 import com.l2jserver.gameserver.model.item.L2Item; 
     47import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
     48import com.l2jserver.gameserver.model.items.L2Item; 
    4949import com.l2jserver.gameserver.model.olympiad.CompetitionType; 
     50import com.l2jserver.gameserver.model.skills.L2Skill; 
    5051import com.l2jserver.gameserver.model.zone.L2ZoneType; 
    5152import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 
    … …  
    5455import com.l2jserver.gameserver.scripting.ManagedScript; 
    5556import com.l2jserver.gameserver.scripting.ScriptManager; 
    56 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    5757import com.l2jserver.gameserver.util.MinionList; 
    5858import com.l2jserver.util.Rnd; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/quest/QuestState.java

    r5083 r5146  
    3535import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance; 
    3636import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    37 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    3837import com.l2jserver.gameserver.model.itemcontainer.PcInventory; 
     38import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
     39import com.l2jserver.gameserver.model.stats.Stats; 
    3940import com.l2jserver.gameserver.network.SystemMessageId; 
    4041import com.l2jserver.gameserver.network.serverpackets.ExShowQuestMark; 
    … …  
    4849import com.l2jserver.gameserver.network.serverpackets.TutorialShowHtml; 
    4950import com.l2jserver.gameserver.network.serverpackets.TutorialShowQuestionMark; 
    50 import com.l2jserver.gameserver.skills.Stats; 
    5151import com.l2jserver.util.Rnd; 
    5252 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/L2Skill.java

    r5112 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.model; 
     15package com.l2jserver.gameserver.model.skills; 
    1616 
    1717import java.util.ArrayList; 
    … …  
    3333import com.l2jserver.gameserver.handler.ITargetTypeHandler; 
    3434import com.l2jserver.gameserver.handler.TargetHandler; 
     35import com.l2jserver.gameserver.model.ChanceCondition; 
     36import com.l2jserver.gameserver.model.IChanceSkillTrigger; 
     37import com.l2jserver.gameserver.model.L2ExtractableProductItem; 
     38import com.l2jserver.gameserver.model.L2ExtractableSkill; 
     39import com.l2jserver.gameserver.model.L2Object; 
     40import com.l2jserver.gameserver.model.StatsSet; 
    3541import com.l2jserver.gameserver.model.actor.L2Attackable; 
    3642import com.l2jserver.gameserver.model.actor.L2Character; 
    … …  
    4147import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    4248import com.l2jserver.gameserver.model.actor.instance.L2SiegeFlagInstance; 
     49import com.l2jserver.gameserver.model.conditions.Condition; 
     50import com.l2jserver.gameserver.model.effects.EffectTemplate; 
     51import com.l2jserver.gameserver.model.effects.L2Effect; 
    4352import com.l2jserver.gameserver.model.entity.TvTEvent; 
    44 import com.l2jserver.gameserver.model.item.L2Armor; 
    45 import com.l2jserver.gameserver.model.item.type.L2ArmorType; 
     53import com.l2jserver.gameserver.model.items.L2Armor; 
     54import com.l2jserver.gameserver.model.items.type.L2ArmorType; 
     55import com.l2jserver.gameserver.model.skills.funcs.Func; 
     56import com.l2jserver.gameserver.model.skills.funcs.FuncTemplate; 
     57import com.l2jserver.gameserver.model.skills.targets.L2TargetType; 
     58import com.l2jserver.gameserver.model.stats.BaseStats; 
     59import com.l2jserver.gameserver.model.stats.Env; 
     60import com.l2jserver.gameserver.model.stats.Formulas; 
     61import com.l2jserver.gameserver.model.stats.Stats; 
    4662import com.l2jserver.gameserver.network.SystemMessageId; 
    4763import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    48 import com.l2jserver.gameserver.skills.BaseStats; 
    49 import com.l2jserver.gameserver.skills.Env; 
    50 import com.l2jserver.gameserver.skills.Formulas; 
    51 import com.l2jserver.gameserver.skills.Stats; 
    52 import com.l2jserver.gameserver.skills.conditions.Condition; 
    53 import com.l2jserver.gameserver.skills.funcs.Func; 
    54 import com.l2jserver.gameserver.skills.funcs.FuncTemplate; 
    55 import com.l2jserver.gameserver.templates.effects.EffectTemplate; 
    56 import com.l2jserver.gameserver.templates.skills.L2SkillType; 
    57 import com.l2jserver.gameserver.templates.skills.L2TargetType; 
    58 import com.l2jserver.gameserver.templates.skills.L2TraitType; 
    5964import com.l2jserver.gameserver.util.Util; 
    6065 
    … …  
    8085        public static final boolean geoEnabled = Config.GEODATA > 0; 
    8186         
    82         public static enum SkillOpType 
    83         { 
    84                 OP_PASSIVE, OP_ACTIVE, OP_TOGGLE 
    85         } 
    86          
    8787        //conditional values 
    8888        public final static int COND_RUNNING = 0x0001; 
    … …  
    108108        // not needed, just for easier debug 
    109109        private final String _name; 
    110         private final SkillOpType _operateType; 
     110        private final L2SkillOpType _operateType; 
    111111        private final boolean _magic; 
    112112        private final L2TraitType _traitType; 
    … …  
    234234        protected List<Condition> _itemPreCondition; 
    235235        protected FuncTemplate[] _funcTemplates; 
    236         protected EffectTemplate[] _effectTemplates; 
     236        public EffectTemplate[] _effectTemplates; 
    237237        protected EffectTemplate[] _effectTemplatesSelf; 
    238238        protected EffectTemplate[] _effectTemplatesPassive; 
    … …  
    272272                _displayId = set.getInteger("displayId", _id); 
    273273                _name = set.getString("name"); 
    274                 _operateType = set.getEnum("operateType", SkillOpType.class); 
     274                _operateType = set.getEnum("operateType", L2SkillOpType.class); 
    275275                _magic = set.getBool("isMagic", false); 
    276276                _traitType = set.getEnum("trait", L2TraitType.class, L2TraitType.NONE); 
    … …  
    10231023        public final boolean isActive() 
    10241024        { 
    1025                 return _operateType == SkillOpType.OP_ACTIVE; 
     1025                return (_operateType != null) && _operateType.isActive(); 
    10261026        } 
    10271027         
    10281028        public final boolean isPassive() 
    10291029        { 
    1030                 return _operateType == SkillOpType.OP_PASSIVE; 
     1030                return (_operateType != null) && _operateType.isPassive(); 
    10311031        } 
    10321032         
    10331033        public final boolean isToggle() 
    10341034        { 
    1035                 return _operateType == SkillOpType.OP_TOGGLE; 
     1035                return (_operateType != null) && _operateType.isToggle(); 
    10361036        } 
    10371037         

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/L2SkillType.java

    r5112 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.templates.skills; 
     15package com.l2jserver.gameserver.model.skills; 
    1616 
    1717import java.lang.reflect.Constructor; 
    1818 
    19 import com.l2jserver.gameserver.model.L2Skill; 
    2019import com.l2jserver.gameserver.model.StatsSet; 
    21 import com.l2jserver.gameserver.skills.l2skills.L2SkillAgathion; 
    22 import com.l2jserver.gameserver.skills.l2skills.L2SkillAppearance; 
    23 import com.l2jserver.gameserver.skills.l2skills.L2SkillChangeWeapon; 
    24 import com.l2jserver.gameserver.skills.l2skills.L2SkillChargeDmg; 
    25 import com.l2jserver.gameserver.skills.l2skills.L2SkillCreateItem; 
    26 import com.l2jserver.gameserver.skills.l2skills.L2SkillDecoy; 
    27 import com.l2jserver.gameserver.skills.l2skills.L2SkillDefault; 
    28 import com.l2jserver.gameserver.skills.l2skills.L2SkillDrain; 
    29 import com.l2jserver.gameserver.skills.l2skills.L2SkillLearnSkill; 
    30 import com.l2jserver.gameserver.skills.l2skills.L2SkillMount; 
    31 import com.l2jserver.gameserver.skills.l2skills.L2SkillSiegeFlag; 
    32 import com.l2jserver.gameserver.skills.l2skills.L2SkillSignet; 
    33 import com.l2jserver.gameserver.skills.l2skills.L2SkillSignetCasttime; 
    34 import com.l2jserver.gameserver.skills.l2skills.L2SkillSpawn; 
    35 import com.l2jserver.gameserver.skills.l2skills.L2SkillSummon; 
    36 import com.l2jserver.gameserver.skills.l2skills.L2SkillSweeper; 
    37 import com.l2jserver.gameserver.skills.l2skills.L2SkillTeleport; 
    38 import com.l2jserver.gameserver.skills.l2skills.L2SkillTrap; 
     20import com.l2jserver.gameserver.model.skills.l2skills.L2SkillAgathion; 
     21import com.l2jserver.gameserver.model.skills.l2skills.L2SkillAppearance; 
     22import com.l2jserver.gameserver.model.skills.l2skills.L2SkillChangeWeapon; 
     23import com.l2jserver.gameserver.model.skills.l2skills.L2SkillChargeDmg; 
     24import com.l2jserver.gameserver.model.skills.l2skills.L2SkillCreateItem; 
     25import com.l2jserver.gameserver.model.skills.l2skills.L2SkillDecoy; 
     26import com.l2jserver.gameserver.model.skills.l2skills.L2SkillDefault; 
     27import com.l2jserver.gameserver.model.skills.l2skills.L2SkillDrain; 
     28import com.l2jserver.gameserver.model.skills.l2skills.L2SkillLearnSkill; 
     29import com.l2jserver.gameserver.model.skills.l2skills.L2SkillMount; 
     30import com.l2jserver.gameserver.model.skills.l2skills.L2SkillSiegeFlag; 
     31import com.l2jserver.gameserver.model.skills.l2skills.L2SkillSignet; 
     32import com.l2jserver.gameserver.model.skills.l2skills.L2SkillSignetCasttime; 
     33import com.l2jserver.gameserver.model.skills.l2skills.L2SkillSpawn; 
     34import com.l2jserver.gameserver.model.skills.l2skills.L2SkillSummon; 
     35import com.l2jserver.gameserver.model.skills.l2skills.L2SkillSweeper; 
     36import com.l2jserver.gameserver.model.skills.l2skills.L2SkillTeleport; 
     37import com.l2jserver.gameserver.model.skills.l2skills.L2SkillTrap; 
    3938 
    4039 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/L2TraitType.java

    r5112 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.templates.skills; 
     15package com.l2jserver.gameserver.model.skills; 
    1616 
    1717/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/funcs/Func.java

    r5112 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.funcs; 
     15package com.l2jserver.gameserver.model.skills.funcs; 
    1616 
    17 import com.l2jserver.gameserver.skills.Env; 
    18 import com.l2jserver.gameserver.skills.Stats; 
    19 import com.l2jserver.gameserver.skills.conditions.Condition; 
     17import com.l2jserver.gameserver.model.conditions.Condition; 
     18import com.l2jserver.gameserver.model.stats.Env; 
     19import com.l2jserver.gameserver.model.stats.Stats; 
    2020 
    2121/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/funcs/FuncAdd.java

    r5112 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.funcs; 
     15package com.l2jserver.gameserver.model.skills.funcs; 
    1616 
    17 import com.l2jserver.gameserver.skills.Env; 
    18 import com.l2jserver.gameserver.skills.Stats; 
     17import com.l2jserver.gameserver.model.stats.Env; 
     18import com.l2jserver.gameserver.model.stats.Stats; 
    1919 
    2020 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/funcs/FuncBaseMul.java

    r5112 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.funcs; 
     15package com.l2jserver.gameserver.model.skills.funcs; 
    1616 
    17 import com.l2jserver.gameserver.skills.Env; 
    18 import com.l2jserver.gameserver.skills.Stats; 
     17import com.l2jserver.gameserver.model.stats.Env; 
     18import com.l2jserver.gameserver.model.stats.Stats; 
    1919 
    2020 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/funcs/FuncDiv.java

    r5112 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.funcs; 
     15package com.l2jserver.gameserver.model.skills.funcs; 
    1616 
    17 import com.l2jserver.gameserver.skills.Env; 
    18 import com.l2jserver.gameserver.skills.Stats; 
     17import com.l2jserver.gameserver.model.stats.Env; 
     18import com.l2jserver.gameserver.model.stats.Stats; 
    1919 
    2020 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/funcs/FuncEnchant.java

    r5114 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.funcs; 
     15package com.l2jserver.gameserver.model.skills.funcs; 
    1616 
    1717import com.l2jserver.Config; 
    1818import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    19 import com.l2jserver.gameserver.model.item.L2Item; 
    20 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    21 import com.l2jserver.gameserver.model.item.type.L2WeaponType; 
    22 import com.l2jserver.gameserver.skills.Env; 
    23 import com.l2jserver.gameserver.skills.Stats; 
     19import com.l2jserver.gameserver.model.items.L2Item; 
     20import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
     21import com.l2jserver.gameserver.model.items.type.L2WeaponType; 
     22import com.l2jserver.gameserver.model.stats.Env; 
     23import com.l2jserver.gameserver.model.stats.Stats; 
    2424 
    2525public class FuncEnchant extends Func 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/funcs/FuncEnchantHp.java

    r5112 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.funcs; 
     15package com.l2jserver.gameserver.model.skills.funcs; 
    1616 
    1717import com.l2jserver.gameserver.datatables.EnchantHPBonusData; 
    18 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    19 import com.l2jserver.gameserver.skills.Env; 
    20 import com.l2jserver.gameserver.skills.Stats; 
     18import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
     19import com.l2jserver.gameserver.model.stats.Env; 
     20import com.l2jserver.gameserver.model.stats.Stats; 
    2121 
    2222/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/funcs/FuncMul.java

    r5112 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.funcs; 
     15package com.l2jserver.gameserver.model.skills.funcs; 
    1616 
    17 import com.l2jserver.gameserver.skills.Env; 
    18 import com.l2jserver.gameserver.skills.Stats; 
     17import com.l2jserver.gameserver.model.stats.Env; 
     18import com.l2jserver.gameserver.model.stats.Stats; 
    1919 
    2020 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/funcs/FuncSet.java

    r5112 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.funcs; 
     15package com.l2jserver.gameserver.model.skills.funcs; 
    1616 
    17 import com.l2jserver.gameserver.skills.Env; 
    18 import com.l2jserver.gameserver.skills.Stats; 
     17import com.l2jserver.gameserver.model.stats.Env; 
     18import com.l2jserver.gameserver.model.stats.Stats; 
    1919 
    2020 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/funcs/FuncSub.java

    r5112 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.funcs; 
     15package com.l2jserver.gameserver.model.skills.funcs; 
    1616 
    17 import com.l2jserver.gameserver.skills.Env; 
    18 import com.l2jserver.gameserver.skills.Stats; 
     17import com.l2jserver.gameserver.model.stats.Env; 
     18import com.l2jserver.gameserver.model.stats.Stats; 
    1919 
    2020 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/funcs/FuncTemplate.java

    r5112 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.funcs; 
     15package com.l2jserver.gameserver.model.skills.funcs; 
    1616 
    1717import java.lang.reflect.Constructor; 
    … …  
    2020import java.util.logging.Logger; 
    2121 
    22 import com.l2jserver.gameserver.skills.Env; 
    23 import com.l2jserver.gameserver.skills.Stats; 
    24 import com.l2jserver.gameserver.skills.conditions.Condition; 
     22import com.l2jserver.gameserver.model.conditions.Condition; 
     23import com.l2jserver.gameserver.model.stats.Env; 
     24import com.l2jserver.gameserver.model.stats.Stats; 
    2525 
    2626/** 
    … …  
    4848                try 
    4949                { 
    50                         func = Class.forName("com.l2jserver.gameserver.skills.funcs.Func" + pFunc); 
     50                        func = Class.forName("com.l2jserver.gameserver.model.skills.funcs.Func" + pFunc); 
    5151                } 
    5252                catch (ClassNotFoundException e) 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/funcs/Lambda.java

    r5112 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.funcs; 
     15package com.l2jserver.gameserver.model.skills.funcs; 
    1616 
    17 import com.l2jserver.gameserver.skills.Env; 
     17import com.l2jserver.gameserver.model.stats.Env; 
    1818 
    1919/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/funcs/LambdaCalc.java

    r5112 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.funcs; 
     15package com.l2jserver.gameserver.model.skills.funcs; 
    1616 
    17 import com.l2jserver.gameserver.skills.Env; 
     17import com.l2jserver.gameserver.model.stats.Env; 
    1818 
    1919/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/funcs/LambdaConst.java

    r5112 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.funcs; 
     15package com.l2jserver.gameserver.model.skills.funcs; 
    1616 
    17 import com.l2jserver.gameserver.skills.Env; 
     17import com.l2jserver.gameserver.model.stats.Env; 
    1818 
    1919/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/funcs/LambdaRnd.java

    r5112 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.funcs; 
     15package com.l2jserver.gameserver.model.skills.funcs; 
    1616 
    17 import com.l2jserver.gameserver.skills.Env; 
     17import com.l2jserver.gameserver.model.stats.Env; 
    1818import com.l2jserver.util.Rnd; 
    1919 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/funcs/LambdaStats.java

    r5112 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.funcs; 
     15package com.l2jserver.gameserver.model.skills.funcs; 
    1616 
    17 import com.l2jserver.gameserver.skills.Env; 
     17import com.l2jserver.gameserver.model.stats.Env; 
    1818 
    1919/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/l2skills/L2SkillAgathion.java

    r5112 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.l2skills; 
     15package com.l2jserver.gameserver.model.skills.l2skills; 
    1616 
    1717import com.l2jserver.gameserver.model.L2Object; 
    18 import com.l2jserver.gameserver.model.L2Skill; 
    1918import com.l2jserver.gameserver.model.StatsSet; 
    2019import com.l2jserver.gameserver.model.actor.L2Character; 
    2120import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     21import com.l2jserver.gameserver.model.skills.L2Skill; 
    2222import com.l2jserver.gameserver.network.SystemMessageId; 
    2323 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/l2skills/L2SkillAppearance.java

    r5112 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.l2skills; 
     15package com.l2jserver.gameserver.model.skills.l2skills; 
    1616 
    1717import java.util.logging.Level; 
    1818 
    1919import com.l2jserver.gameserver.model.L2Object; 
    20 import com.l2jserver.gameserver.model.L2Skill; 
    2120import com.l2jserver.gameserver.model.StatsSet; 
    2221import com.l2jserver.gameserver.model.actor.L2Character; 
    2322import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     23import com.l2jserver.gameserver.model.skills.L2Skill; 
    2424 
    2525 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/l2skills/L2SkillChangeWeapon.java

    r5112 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.l2skills; 
     15package com.l2jserver.gameserver.model.skills.l2skills; 
    1616 
    1717import com.l2jserver.gameserver.model.Elementals; 
    1818import com.l2jserver.gameserver.model.L2Object; 
    19 import com.l2jserver.gameserver.model.L2Skill; 
    2019import com.l2jserver.gameserver.model.StatsSet; 
    2120import com.l2jserver.gameserver.model.actor.L2Character; 
    2221import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    23 import com.l2jserver.gameserver.model.item.L2Weapon; 
    24 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2522import com.l2jserver.gameserver.model.itemcontainer.Inventory; 
     23import com.l2jserver.gameserver.model.items.L2Weapon; 
     24import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
     25import com.l2jserver.gameserver.model.skills.L2Skill; 
    2626import com.l2jserver.gameserver.network.SystemMessageId; 
    2727import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate; 
    … …  
    4444         
    4545        /** 
    46          * @see com.l2jserver.gameserver.model.L2Skill#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Object[]) 
     46         * @see com.l2jserver.gameserver.model.skills.L2Skill#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Object[]) 
    4747         */ 
    4848        @Override 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/l2skills/L2SkillChargeDmg.java

    r5112 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.l2skills; 
     15package com.l2jserver.gameserver.model.skills.l2skills; 
    1616 
    1717import java.util.logging.Level; 
    … …  
    2020 
    2121import com.l2jserver.Config; 
    22 import com.l2jserver.gameserver.model.L2Effect; 
    2322import com.l2jserver.gameserver.model.L2Object; 
    24 import com.l2jserver.gameserver.model.L2Skill; 
    2523import com.l2jserver.gameserver.model.StatsSet; 
    2624import com.l2jserver.gameserver.model.actor.L2Character; 
    2725import com.l2jserver.gameserver.model.actor.L2Playable; 
    2826import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    29 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    30 import com.l2jserver.gameserver.model.item.type.L2WeaponType; 
     27import com.l2jserver.gameserver.model.effects.L2Effect; 
     28import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
     29import com.l2jserver.gameserver.model.items.type.L2WeaponType; 
     30import com.l2jserver.gameserver.model.skills.L2Skill; 
     31import com.l2jserver.gameserver.model.stats.BaseStats; 
     32import com.l2jserver.gameserver.model.stats.Env; 
     33import com.l2jserver.gameserver.model.stats.Formulas; 
    3134import com.l2jserver.gameserver.network.SystemMessageId; 
    3235import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    33 import com.l2jserver.gameserver.skills.BaseStats; 
    34 import com.l2jserver.gameserver.skills.Env; 
    35 import com.l2jserver.gameserver.skills.Formulas; 
    3636 
    3737public class L2SkillChargeDmg extends L2Skill 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/l2skills/L2SkillCreateItem.java

    r5112 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.l2skills; 
     15package com.l2jserver.gameserver.model.skills.l2skills; 
    1616 
    1717import com.l2jserver.gameserver.model.L2Object; 
    18 import com.l2jserver.gameserver.model.L2Skill; 
    1918import com.l2jserver.gameserver.model.StatsSet; 
    2019import com.l2jserver.gameserver.model.actor.L2Character; 
    … …  
    2221import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    2322import com.l2jserver.gameserver.model.actor.instance.L2PetInstance; 
     23import com.l2jserver.gameserver.model.skills.L2Skill; 
    2424import com.l2jserver.gameserver.network.SystemMessageId; 
    2525import com.l2jserver.gameserver.network.serverpackets.PetItemList; 
    … …  
    4646         
    4747        /** 
    48          * @see com.l2jserver.gameserver.model.L2Skill#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Object[]) 
     48         * @see com.l2jserver.gameserver.model.skills.L2Skill#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Object[]) 
    4949         */ 
    5050        @Override 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/l2skills/L2SkillDecoy.java

    r5112 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.l2skills; 
     15package com.l2jserver.gameserver.model.skills.l2skills; 
    1616 
    1717import com.l2jserver.gameserver.datatables.NpcTable; 
    1818import com.l2jserver.gameserver.idfactory.IdFactory; 
    1919import com.l2jserver.gameserver.model.L2Object; 
    20 import com.l2jserver.gameserver.model.L2Skill; 
    2120import com.l2jserver.gameserver.model.StatsSet; 
    2221import com.l2jserver.gameserver.model.actor.L2Character; 
    2322import com.l2jserver.gameserver.model.actor.instance.L2DecoyInstance; 
    2423import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    25 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
     24import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
     25import com.l2jserver.gameserver.model.skills.L2Skill; 
    2626 
    2727public class L2SkillDecoy extends L2Skill 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/l2skills/L2SkillDefault.java

    r5112 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.l2skills; 
     15package com.l2jserver.gameserver.model.skills.l2skills; 
    1616 
    1717import com.l2jserver.gameserver.model.L2Object; 
    18 import com.l2jserver.gameserver.model.L2Skill; 
    1918import com.l2jserver.gameserver.model.StatsSet; 
    2019import com.l2jserver.gameserver.model.actor.L2Character; 
     20import com.l2jserver.gameserver.model.skills.L2Skill; 
    2121import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 
    2222 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/l2skills/L2SkillDrain.java

    r5112 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.l2skills; 
     15package com.l2jserver.gameserver.model.skills.l2skills; 
    1616 
    1717import java.util.logging.Level; 
    … …  
    2020 
    2121import com.l2jserver.Config; 
    22 import com.l2jserver.gameserver.model.L2Effect; 
    2322import com.l2jserver.gameserver.model.L2Object; 
    24 import com.l2jserver.gameserver.model.L2Skill; 
    2523import com.l2jserver.gameserver.model.StatsSet; 
    2624import com.l2jserver.gameserver.model.actor.L2Character; 
    … …  
    3028import com.l2jserver.gameserver.model.actor.instance.L2CubicInstance; 
    3129import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    32 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     30import com.l2jserver.gameserver.model.effects.L2Effect; 
     31import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
     32import com.l2jserver.gameserver.model.skills.L2Skill; 
     33import com.l2jserver.gameserver.model.skills.targets.L2TargetType; 
     34import com.l2jserver.gameserver.model.stats.Formulas; 
    3335import com.l2jserver.gameserver.network.SystemMessageId; 
    3436import com.l2jserver.gameserver.network.serverpackets.StatusUpdate; 
    3537import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    36 import com.l2jserver.gameserver.skills.Formulas; 
    37 import com.l2jserver.gameserver.templates.skills.L2TargetType; 
    3838 
    3939public class L2SkillDrain extends L2Skill 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/l2skills/L2SkillElemental.java

    r5112 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.l2skills; 
     15package com.l2jserver.gameserver.model.skills.l2skills; 
    1616 
    17 import com.l2jserver.gameserver.model.L2Effect; 
    1817import com.l2jserver.gameserver.model.L2Object; 
    19 import com.l2jserver.gameserver.model.L2Skill; 
    2018import com.l2jserver.gameserver.model.StatsSet; 
    2119import com.l2jserver.gameserver.model.actor.L2Character; 
    2220import com.l2jserver.gameserver.model.actor.L2Summon; 
    2321import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    24 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    25 import com.l2jserver.gameserver.skills.Env; 
    26 import com.l2jserver.gameserver.skills.Formulas; 
     22import com.l2jserver.gameserver.model.effects.L2Effect; 
     23import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
     24import com.l2jserver.gameserver.model.skills.L2Skill; 
     25import com.l2jserver.gameserver.model.stats.Env; 
     26import com.l2jserver.gameserver.model.stats.Formulas; 
    2727 
    2828public class L2SkillElemental extends L2Skill { 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/l2skills/L2SkillLearnSkill.java

    r5112 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.l2skills; 
     15package com.l2jserver.gameserver.model.skills.l2skills; 
    1616 
    1717import com.l2jserver.gameserver.datatables.SkillTable; 
    1818import com.l2jserver.gameserver.model.L2Object; 
    19 import com.l2jserver.gameserver.model.L2Skill; 
    2019import com.l2jserver.gameserver.model.StatsSet; 
    2120import com.l2jserver.gameserver.model.actor.L2Character; 
    2221import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     22import com.l2jserver.gameserver.model.skills.L2Skill; 
    2323 
    2424public class L2SkillLearnSkill extends L2Skill 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/l2skills/L2SkillMount.java

    r5112 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.l2skills; 
     15package com.l2jserver.gameserver.model.skills.l2skills; 
    1616 
    1717import com.l2jserver.gameserver.model.L2Object; 
    18 import com.l2jserver.gameserver.model.L2Skill; 
    1918import com.l2jserver.gameserver.model.StatsSet; 
    2019import com.l2jserver.gameserver.model.actor.L2Character; 
    2120import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    2221import com.l2jserver.gameserver.model.entity.TvTEvent; 
     22import com.l2jserver.gameserver.model.skills.L2Skill; 
    2323import com.l2jserver.gameserver.network.SystemMessageId; 
    2424 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/l2skills/L2SkillSiegeFlag.java

    r5112 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.l2skills; 
     15package com.l2jserver.gameserver.model.skills.l2skills; 
    1616 
    1717import java.util.logging.Level; 
    … …  
    2727import com.l2jserver.gameserver.instancemanager.TerritoryWarManager; 
    2828import com.l2jserver.gameserver.model.L2Object; 
    29 import com.l2jserver.gameserver.model.L2Skill; 
    3029import com.l2jserver.gameserver.model.StatsSet; 
    3130import com.l2jserver.gameserver.model.actor.L2Character; 
    … …  
    3534import com.l2jserver.gameserver.model.entity.Fort; 
    3635import com.l2jserver.gameserver.model.entity.clanhall.SiegableHall; 
     36import com.l2jserver.gameserver.model.skills.L2Skill; 
    3737import com.l2jserver.gameserver.network.SystemMessageId; 
    3838 
    … …  
    5050         
    5151        /** 
    52          * @see com.l2jserver.gameserver.model.L2Skill#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Object[]) 
     52         * @see com.l2jserver.gameserver.model.skills.L2Skill#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Object[]) 
    5353         */ 
    5454        @Override 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/l2skills/L2SkillSignet.java

    r5112 r5146  
    1818 */ 
    1919 
    20 package com.l2jserver.gameserver.skills.l2skills; 
     20package com.l2jserver.gameserver.model.skills.l2skills; 
    2121 
    2222import com.l2jserver.gameserver.datatables.NpcTable; 
    2323import com.l2jserver.gameserver.idfactory.IdFactory; 
    2424import com.l2jserver.gameserver.model.L2Object; 
    25 import com.l2jserver.gameserver.model.L2Skill; 
    2625import com.l2jserver.gameserver.model.StatsSet; 
    2726import com.l2jserver.gameserver.model.actor.L2Character; 
    2827import com.l2jserver.gameserver.model.actor.instance.L2EffectPointInstance; 
    2928import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    30 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    31 import com.l2jserver.gameserver.templates.skills.L2TargetType; 
     29import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
     30import com.l2jserver.gameserver.model.skills.L2Skill; 
     31import com.l2jserver.gameserver.model.skills.targets.L2TargetType; 
    3232import com.l2jserver.gameserver.util.Point3D; 
    3333 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/l2skills/L2SkillSignetCasttime.java

    r5112 r5146  
    1818 */ 
    1919 
    20 package com.l2jserver.gameserver.skills.l2skills; 
     20package com.l2jserver.gameserver.model.skills.l2skills; 
    2121 
    2222import com.l2jserver.gameserver.model.L2Object; 
    23 import com.l2jserver.gameserver.model.L2Skill; 
    2423import com.l2jserver.gameserver.model.StatsSet; 
    2524import com.l2jserver.gameserver.model.actor.L2Character; 
     25import com.l2jserver.gameserver.model.skills.L2Skill; 
    2626 
    2727public final class L2SkillSignetCasttime extends L2Skill 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/l2skills/L2SkillSpawn.java

    r5121 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.l2skills; 
     15package com.l2jserver.gameserver.model.skills.l2skills; 
    1616 
    1717import java.util.logging.Level; 
    … …  
    2020import com.l2jserver.gameserver.datatables.NpcTable; 
    2121import com.l2jserver.gameserver.model.L2Object; 
    22 import com.l2jserver.gameserver.model.L2Skill; 
    2322import com.l2jserver.gameserver.model.L2Spawn; 
    2423import com.l2jserver.gameserver.model.StatsSet; 
    … …  
    2625import com.l2jserver.gameserver.model.actor.L2Npc; 
    2726import com.l2jserver.gameserver.model.actor.instance.L2TotemInstance; 
    28 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
     27import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
     28import com.l2jserver.gameserver.model.skills.L2Skill; 
    2929import com.l2jserver.util.Rnd; 
    3030 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/l2skills/L2SkillSummon.java

    r5112 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.l2skills; 
     15package com.l2jserver.gameserver.model.skills.l2skills; 
    1616 
    1717import com.l2jserver.Config; 
    … …  
    2020import com.l2jserver.gameserver.idfactory.IdFactory; 
    2121import com.l2jserver.gameserver.model.L2Object; 
    22 import com.l2jserver.gameserver.model.L2Skill; 
    2322import com.l2jserver.gameserver.model.StatsSet; 
    2423import com.l2jserver.gameserver.model.actor.L2Character; 
    … …  
    2625import com.l2jserver.gameserver.model.actor.instance.L2MerchantSummonInstance; 
    2726import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     27import com.l2jserver.gameserver.model.actor.instance.L2ServitorInstance; 
    2828import com.l2jserver.gameserver.model.actor.instance.L2SiegeSummonInstance; 
    29 import com.l2jserver.gameserver.model.actor.instance.L2SummonInstance; 
     29import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
     30import com.l2jserver.gameserver.model.skills.L2Skill; 
     31import com.l2jserver.gameserver.model.skills.targets.L2TargetType; 
    3032import com.l2jserver.gameserver.network.SystemMessageId; 
    31 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    32 import com.l2jserver.gameserver.templates.skills.L2TargetType; 
    3333 
    3434public class L2SkillSummon extends L2Skill 
    … …  
    221221                } 
    222222                 
    223                 L2SummonInstance summon; 
     223                L2ServitorInstance summon; 
    224224                L2NpcTemplate summonTemplate = NpcTable.getInstance().getTemplate(_npcId); 
    225225                if (summonTemplate == null) 
    … …  
    235235                        summon = new L2MerchantSummonInstance(id, summonTemplate, activeChar, this); 
    236236                else 
    237                         summon = new L2SummonInstance(id, summonTemplate, activeChar, this); 
     237                        summon = new L2ServitorInstance(id, summonTemplate, activeChar, this); 
    238238                 
    239239                summon.setName(summonTemplate.getName()); 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/l2skills/L2SkillSweeper.java

    r5112 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.l2skills; 
     15package com.l2jserver.gameserver.model.skills.l2skills; 
    1616 
    1717import com.l2jserver.gameserver.model.L2Object; 
    18 import com.l2jserver.gameserver.model.L2Skill; 
    1918import com.l2jserver.gameserver.model.StatsSet; 
    2019import com.l2jserver.gameserver.model.actor.L2Character; 
     20import com.l2jserver.gameserver.model.skills.L2Skill; 
    2121 
    2222/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/l2skills/L2SkillTeleport.java

    r5112 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.l2skills; 
     15package com.l2jserver.gameserver.model.skills.l2skills; 
    1616 
    1717import java.util.logging.Level; 
    … …  
    2020import com.l2jserver.gameserver.instancemanager.MapRegionManager; 
    2121import com.l2jserver.gameserver.model.L2Object; 
    22 import com.l2jserver.gameserver.model.L2Skill; 
    2322import com.l2jserver.gameserver.model.Location; 
    2423import com.l2jserver.gameserver.model.StatsSet; 
    … …  
    2625import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    2726import com.l2jserver.gameserver.model.entity.TvTEvent; 
     27import com.l2jserver.gameserver.model.skills.L2Skill; 
     28import com.l2jserver.gameserver.model.skills.L2SkillType; 
    2829import com.l2jserver.gameserver.network.SystemMessageId; 
    2930import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 
    30 import com.l2jserver.gameserver.templates.skills.L2SkillType; 
    3131 
    3232public class L2SkillTeleport extends L2Skill 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/l2skills/L2SkillTrap.java

    r5112 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills.l2skills; 
     15package com.l2jserver.gameserver.model.skills.l2skills; 
    1616 
    1717import com.l2jserver.gameserver.datatables.NpcTable; 
    … …  
    1919import com.l2jserver.gameserver.idfactory.IdFactory; 
    2020import com.l2jserver.gameserver.model.L2Object; 
    21 import com.l2jserver.gameserver.model.L2Skill; 
    2221import com.l2jserver.gameserver.model.L2Spawn; 
    2322import com.l2jserver.gameserver.model.StatsSet; 
    … …  
    2625import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    2726import com.l2jserver.gameserver.model.actor.instance.L2TrapInstance; 
    28 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
     27import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
     28import com.l2jserver.gameserver.model.skills.L2Skill; 
    2929 
    3030public class L2SkillTrap extends L2SkillSummon 
    … …  
    5454        /** 
    5555         *  
    56          * @see com.l2jserver.gameserver.model.L2Skill#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Object[]) 
     56         * @see com.l2jserver.gameserver.model.skills.L2Skill#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Object[]) 
    5757         */ 
    5858        @Override 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/targets/L2TargetType.java

    r5112 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.templates.skills; 
     15package com.l2jserver.gameserver.model.skills.targets; 
    1616 
    1717/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/stats/BaseStats.java

    r5112 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills; 
     15package com.l2jserver.gameserver.model.stats; 
    1616 
    1717import java.io.File; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/stats/Calculator.java

    r5112 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills; 
     15package com.l2jserver.gameserver.model.stats; 
    1616 
    1717import javolution.util.FastList; 
    1818 
    19 import com.l2jserver.gameserver.skills.funcs.Func; 
     19import com.l2jserver.gameserver.model.skills.funcs.Func; 
    2020 
    2121 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/stats/Env.java

    r5112 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills; 
     15package com.l2jserver.gameserver.model.stats; 
    1616 
    17 import com.l2jserver.gameserver.model.L2Effect; 
    18 import com.l2jserver.gameserver.model.L2Skill; 
    1917import com.l2jserver.gameserver.model.actor.L2Character; 
    2018import com.l2jserver.gameserver.model.actor.instance.L2CubicInstance; 
    21 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     19import com.l2jserver.gameserver.model.effects.L2Effect; 
     20import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
     21import com.l2jserver.gameserver.model.skills.L2Skill; 
    2222 
    2323/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/stats/Formulas.java

    r5112 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills; 
     15package com.l2jserver.gameserver.model.stats; 
    1616 
    1717import java.util.logging.Level; 
    … …  
    2121import com.l2jserver.gameserver.SevenSigns; 
    2222import com.l2jserver.gameserver.SevenSignsFestival; 
     23import com.l2jserver.gameserver.datatables.hitConditionBonus; 
    2324import com.l2jserver.gameserver.instancemanager.CastleManager; 
    2425import com.l2jserver.gameserver.instancemanager.ClanHallManager; 
    … …  
    2829import com.l2jserver.gameserver.model.Elementals; 
    2930import com.l2jserver.gameserver.model.L2SiegeClan; 
    30 import com.l2jserver.gameserver.model.L2Skill; 
    3131import com.l2jserver.gameserver.model.actor.L2Attackable; 
    3232import com.l2jserver.gameserver.model.actor.L2Character; 
    … …  
    3939import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    4040import com.l2jserver.gameserver.model.actor.instance.L2PetInstance; 
    41 import com.l2jserver.gameserver.model.actor.instance.L2SummonInstance; 
     41import com.l2jserver.gameserver.model.actor.instance.L2ServitorInstance; 
     42import com.l2jserver.gameserver.model.actor.templates.L2PcTemplate; 
    4243import com.l2jserver.gameserver.model.base.PlayerState; 
     44import com.l2jserver.gameserver.model.conditions.ConditionPlayerState; 
     45import com.l2jserver.gameserver.model.conditions.ConditionUsingItemType; 
     46import com.l2jserver.gameserver.model.effects.EffectTemplate; 
    4347import com.l2jserver.gameserver.model.entity.Castle; 
    4448import com.l2jserver.gameserver.model.entity.ClanHall; 
    4549import com.l2jserver.gameserver.model.entity.Fort; 
    4650import com.l2jserver.gameserver.model.entity.Siege; 
    47 import com.l2jserver.gameserver.model.item.L2Armor; 
    48 import com.l2jserver.gameserver.model.item.L2Item; 
    49 import com.l2jserver.gameserver.model.item.L2Weapon; 
    50 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    51 import com.l2jserver.gameserver.model.item.type.L2ArmorType; 
    52 import com.l2jserver.gameserver.model.item.type.L2WeaponType; 
    5351import com.l2jserver.gameserver.model.itemcontainer.Inventory; 
     52import com.l2jserver.gameserver.model.items.L2Armor; 
     53import com.l2jserver.gameserver.model.items.L2Item; 
     54import com.l2jserver.gameserver.model.items.L2Weapon; 
     55import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
     56import com.l2jserver.gameserver.model.items.type.L2ArmorType; 
     57import com.l2jserver.gameserver.model.items.type.L2WeaponType; 
     58import com.l2jserver.gameserver.model.skills.L2Skill; 
     59import com.l2jserver.gameserver.model.skills.L2SkillType; 
     60import com.l2jserver.gameserver.model.skills.L2TraitType; 
     61import com.l2jserver.gameserver.model.skills.funcs.Func; 
    5462import com.l2jserver.gameserver.model.zone.type.L2CastleZone; 
    5563import com.l2jserver.gameserver.model.zone.type.L2ClanHallZone; 
    … …  
    5866import com.l2jserver.gameserver.network.SystemMessageId; 
    5967import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    60 import com.l2jserver.gameserver.skills.conditions.ConditionPlayerState; 
    61 import com.l2jserver.gameserver.skills.conditions.ConditionUsingItemType; 
    62 import com.l2jserver.gameserver.skills.funcs.Func; 
    63 import com.l2jserver.gameserver.templates.chars.L2PcTemplate; 
    64 import com.l2jserver.gameserver.templates.effects.EffectTemplate; 
    65 import com.l2jserver.gameserver.templates.skills.L2SkillType; 
    66 import com.l2jserver.gameserver.templates.skills.L2TraitType; 
    6768import com.l2jserver.gameserver.util.Util; 
    6869import com.l2jserver.util.Rnd; 
    … …  
    15711572                 
    15721573                // for summon use pet weapon vuln, since they cant hold weapon 
    1573                 if (attacker instanceof L2SummonInstance) 
     1574                if (attacker instanceof L2ServitorInstance) 
    15741575                        stat = Stats.PET_WPN_VULN; 
    15751576                 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/stats/Stats.java

    r5112 r5146  
    1313 * this program. If not, see <http://www.gnu.org/licenses/>. 
    1414 */ 
    15 package com.l2jserver.gameserver.skills; 
     15package com.l2jserver.gameserver.model.stats; 
    1616 
    1717import java.util.NoSuchElementException; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/zone/L2ZoneForm.java

    r5083 r5146  
    1717import com.l2jserver.gameserver.idfactory.IdFactory; 
    1818import com.l2jserver.gameserver.instancemanager.ZoneManager; 
    19 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     19import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    2020 
    2121/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/zone/type/L2AbnormalZone.java

    r4417 r5146  
    1616 
    1717import com.l2jserver.gameserver.model.actor.L2Character; 
     18import com.l2jserver.gameserver.model.effects.AbnormalEffect; 
    1819import com.l2jserver.gameserver.model.zone.L2ZoneType; 
    19 import com.l2jserver.gameserver.skills.AbnormalEffect; 
    2020 
    2121/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/zone/type/L2DamageZone.java

    r4981 r5146  
    2323import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    2424import com.l2jserver.gameserver.model.entity.Castle; 
     25import com.l2jserver.gameserver.model.stats.Stats; 
    2526import com.l2jserver.gameserver.model.zone.L2ZoneType; 
    26 import com.l2jserver.gameserver.skills.Stats; 
    2727 
    2828 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/zone/type/L2DynamicZone.java

    r4981 r5146  
    1818 
    1919import com.l2jserver.gameserver.ThreadPoolManager; 
    20 import com.l2jserver.gameserver.model.L2Skill; 
    2120import com.l2jserver.gameserver.model.L2WorldRegion; 
    2221import com.l2jserver.gameserver.model.actor.L2Character; 
    2322import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     23import com.l2jserver.gameserver.model.skills.L2Skill; 
    2424import com.l2jserver.gameserver.model.zone.L2ZoneType; 
    2525 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/zone/type/L2EffectZone.java

    r4884 r5146  
    2323import com.l2jserver.gameserver.datatables.SkillTable; 
    2424import com.l2jserver.gameserver.model.L2Object.InstanceType; 
    25 import com.l2jserver.gameserver.model.L2Skill; 
    2625import com.l2jserver.gameserver.model.actor.L2Character; 
    2726import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     27import com.l2jserver.gameserver.model.skills.L2Skill; 
    2828import com.l2jserver.gameserver.model.zone.L2ZoneType; 
    2929import com.l2jserver.gameserver.network.serverpackets.EtcStatusUpdate; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/zone/type/L2SiegeZone.java

    r5116 r5146  
    2424import com.l2jserver.gameserver.instancemanager.MapRegionManager; 
    2525import com.l2jserver.gameserver.model.L2Clan; 
    26 import com.l2jserver.gameserver.model.L2Effect; 
    27 import com.l2jserver.gameserver.model.L2Skill; 
    2826import com.l2jserver.gameserver.model.actor.L2Character; 
    2927import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    3028import com.l2jserver.gameserver.model.actor.instance.L2SiegeSummonInstance; 
     29import com.l2jserver.gameserver.model.effects.L2Effect; 
    3130import com.l2jserver.gameserver.model.entity.Fort; 
    3231import com.l2jserver.gameserver.model.entity.FortSiege; 
    3332import com.l2jserver.gameserver.model.entity.Siegable; 
    3433import com.l2jserver.gameserver.model.entity.clanhall.SiegableHall; 
     34import com.l2jserver.gameserver.model.skills.L2Skill; 
    3535import com.l2jserver.gameserver.model.zone.L2ZoneType; 
    3636import com.l2jserver.gameserver.network.SystemMessageId; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/AbstractRefinePacket.java

    r5093 r5146  
    2222import com.l2jserver.Config; 
    2323import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    24 import com.l2jserver.gameserver.model.item.L2Armor; 
    25 import com.l2jserver.gameserver.model.item.L2Item; 
    26 import com.l2jserver.gameserver.model.item.L2Weapon; 
    27 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     24import com.l2jserver.gameserver.model.items.L2Armor; 
     25import com.l2jserver.gameserver.model.items.L2Item; 
     26import com.l2jserver.gameserver.model.items.L2Weapon; 
     27import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    2828import com.l2jserver.gameserver.network.SystemMessageId; 
    2929 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/CharacterCreate.java

    r5083 r5146  
    3434import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    3535import com.l2jserver.gameserver.model.actor.stat.PcStat; 
    36 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     36import com.l2jserver.gameserver.model.actor.templates.L2PcTemplate; 
     37import com.l2jserver.gameserver.model.actor.templates.L2PcTemplate.PcTemplateItem; 
     38import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    3739import com.l2jserver.gameserver.model.quest.Quest; 
    3840import com.l2jserver.gameserver.model.quest.QuestState; 
    … …  
    4244import com.l2jserver.gameserver.network.serverpackets.CharCreateOk; 
    4345import com.l2jserver.gameserver.network.serverpackets.CharSelectionInfo; 
    44 import com.l2jserver.gameserver.templates.chars.L2PcTemplate; 
    45 import com.l2jserver.gameserver.templates.chars.L2PcTemplate.PcTemplateItem; 
    4646import com.l2jserver.gameserver.util.Util; 
    4747 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/EnterWorld.java

    r5093 r5146  
    5858import com.l2jserver.gameserver.model.entity.clanhall.AuctionableHall; 
    5959import com.l2jserver.gameserver.model.entity.clanhall.SiegableHall; 
    60 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     60import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    6161import com.l2jserver.gameserver.model.quest.Quest; 
    6262import com.l2jserver.gameserver.model.quest.QuestState; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/MoveToLocationInAirShip.java

    r5083 r5146  
    1818import com.l2jserver.gameserver.model.actor.instance.L2AirShipInstance; 
    1919import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    20 import com.l2jserver.gameserver.model.item.type.L2WeaponType; 
     20import com.l2jserver.gameserver.model.items.type.L2WeaponType; 
    2121import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 
    2222import com.l2jserver.gameserver.network.serverpackets.ExMoveToLocationInAirShip; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/MultiSellChoose.java

    r5093 r5146  
    2626import com.l2jserver.gameserver.model.actor.L2Npc; 
    2727import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    28 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2928import com.l2jserver.gameserver.model.itemcontainer.PcInventory; 
     29import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    3030import com.l2jserver.gameserver.model.multisell.Entry; 
    3131import com.l2jserver.gameserver.model.multisell.Ingredient; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/NewCharacter.java

    r4733 r5146  
    1919import com.l2jserver.Config; 
    2020import com.l2jserver.gameserver.datatables.CharTemplateTable; 
     21import com.l2jserver.gameserver.model.actor.templates.L2PcTemplate; 
    2122import com.l2jserver.gameserver.model.base.ClassId; 
    2223import com.l2jserver.gameserver.network.serverpackets.NewCharacterSuccess; 
    23 import com.l2jserver.gameserver.templates.chars.L2PcTemplate; 
    2424 
    2525/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestAcquireSkill.java

    r5093 r5146  
    2222import com.l2jserver.gameserver.instancemanager.QuestManager; 
    2323import com.l2jserver.gameserver.model.L2Clan; 
    24 import com.l2jserver.gameserver.model.L2Skill; 
    2524import com.l2jserver.gameserver.model.L2SkillLearn; 
    2625import com.l2jserver.gameserver.model.L2SquadTrainer; 
    … …  
    3231import com.l2jserver.gameserver.model.actor.instance.L2TransformManagerInstance; 
    3332import com.l2jserver.gameserver.model.actor.instance.L2VillageMasterInstance; 
    34 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     33import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    3534import com.l2jserver.gameserver.model.quest.Quest; 
    3635import com.l2jserver.gameserver.model.quest.QuestState; 
     36import com.l2jserver.gameserver.model.skills.L2Skill; 
    3737import com.l2jserver.gameserver.network.SystemMessageId; 
    3838import com.l2jserver.gameserver.network.serverpackets.AcquireSkillDone; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestAcquireSkillInfo.java

    r5014 r5146  
    2020import com.l2jserver.gameserver.datatables.SkillTable; 
    2121import com.l2jserver.gameserver.datatables.SkillTreesData; 
    22 import com.l2jserver.gameserver.model.L2Skill; 
    2322import com.l2jserver.gameserver.model.L2SkillLearn; 
    2423import com.l2jserver.gameserver.model.L2SquadTrainer; 
    … …  
    2726import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    2827import com.l2jserver.gameserver.model.actor.instance.L2TransformManagerInstance; 
     28import com.l2jserver.gameserver.model.skills.L2Skill; 
    2929import com.l2jserver.gameserver.network.serverpackets.AcquireSkillInfo; 
    3030import com.l2jserver.gameserver.network.serverpackets.AcquireSkillList.SkillType; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestActionUse.java

    r5115 r5146  
    3333import com.l2jserver.gameserver.model.L2ManufactureList; 
    3434import com.l2jserver.gameserver.model.L2Object; 
    35 import com.l2jserver.gameserver.model.L2Skill; 
    3635import com.l2jserver.gameserver.model.actor.L2Character; 
    3736import com.l2jserver.gameserver.model.actor.L2Summon; 
    … …  
    4039import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    4140import com.l2jserver.gameserver.model.actor.instance.L2PetInstance; 
     41import com.l2jserver.gameserver.model.actor.instance.L2ServitorInstance; 
    4242import com.l2jserver.gameserver.model.actor.instance.L2SiegeFlagInstance; 
    4343import com.l2jserver.gameserver.model.actor.instance.L2SiegeSummonInstance; 
    4444import com.l2jserver.gameserver.model.actor.instance.L2StaticObjectInstance; 
    45 import com.l2jserver.gameserver.model.actor.instance.L2SummonInstance; 
     45import com.l2jserver.gameserver.model.skills.L2Skill; 
    4646import com.l2jserver.gameserver.network.SystemMessageId; 
    4747import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 
    … …  
    354354                                break; 
    355355                        case 52: // Unsummon 
    356                                 if (pet != null && pet instanceof L2SummonInstance) 
     356                                if (pet != null && pet instanceof L2ServitorInstance) 
    357357                                { 
    358358                                        if (pet.isBetrayed()) 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestAutoSoulShot.java

    r5083 r5146  
    1919import com.l2jserver.Config; 
    2020import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    21 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     21import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    2222import com.l2jserver.gameserver.network.SystemMessageId; 
    2323import com.l2jserver.gameserver.network.serverpackets.ExAutoSoulShot; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestBuyItem.java

    r5093 r5146  
    3131import com.l2jserver.gameserver.model.actor.instance.L2MerchantSummonInstance; 
    3232import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    33 import com.l2jserver.gameserver.model.item.L2Item; 
     33import com.l2jserver.gameserver.model.items.L2Item; 
    3434import com.l2jserver.gameserver.network.SystemMessageId; 
    3535import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestBuySeed.java

    r5093 r5146  
    2727import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    2828import com.l2jserver.gameserver.model.entity.Castle; 
    29 import com.l2jserver.gameserver.model.item.L2Item; 
     29import com.l2jserver.gameserver.model.items.L2Item; 
    3030import com.l2jserver.gameserver.network.SystemMessageId; 
    3131import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestCancelPostAttachment.java

    r5093 r5146  
    2222import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    2323import com.l2jserver.gameserver.model.entity.Message; 
    24 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    25 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance.ItemLocation; 
    2624import com.l2jserver.gameserver.model.itemcontainer.ItemContainer; 
     25import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
     26import com.l2jserver.gameserver.model.items.instance.L2ItemInstance.ItemLocation; 
    2727import com.l2jserver.gameserver.network.SystemMessageId; 
    2828import com.l2jserver.gameserver.network.serverpackets.ExChangePostState; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestChangeNicknameColor.java

    r5083 r5146  
    1616 
    1717import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    18 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     18import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    1919 
    2020/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestConfirmCancelItem.java

    r5093 r5146  
    1717import com.l2jserver.Config; 
    1818import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    19 import com.l2jserver.gameserver.model.item.L2Item; 
    20 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     19import com.l2jserver.gameserver.model.items.L2Item; 
     20import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    2121import com.l2jserver.gameserver.network.SystemMessageId; 
    2222import com.l2jserver.gameserver.network.serverpackets.ExPutItemResultForVariationCancel; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestConfirmGemStone.java

    r5093 r5146  
    1616 
    1717import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    18 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     18import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    1919import com.l2jserver.gameserver.network.SystemMessageId; 
    2020import com.l2jserver.gameserver.network.serverpackets.ExPutCommissionResultForVariationMake; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestConfirmRefinerItem.java

    r5093 r5146  
    1616 
    1717import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    18 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     18import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    1919import com.l2jserver.gameserver.network.SystemMessageId; 
    2020import com.l2jserver.gameserver.network.serverpackets.ExPutIntensiveResultForVariationMake; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestConfirmTargetItem.java

    r5093 r5146  
    1616 
    1717import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    18 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     18import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    1919import com.l2jserver.gameserver.network.SystemMessageId; 
    2020import com.l2jserver.gameserver.network.serverpackets.ExPutItemResultForVariationMake; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestCrystallizeItem.java

    r5083 r5146  
    1818 
    1919import com.l2jserver.Config; 
    20 import com.l2jserver.gameserver.model.L2Skill; 
    2120import com.l2jserver.gameserver.model.L2World; 
    2221import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    2322import com.l2jserver.gameserver.model.base.Race; 
    24 import com.l2jserver.gameserver.model.item.L2Item; 
    25 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2623import com.l2jserver.gameserver.model.itemcontainer.PcInventory; 
     24import com.l2jserver.gameserver.model.items.L2Item; 
     25import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
     26import com.l2jserver.gameserver.model.skills.L2Skill; 
    2727import com.l2jserver.gameserver.network.SystemMessageId; 
    2828import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestDestroyItem.java

    r5083 r5146  
    2525import com.l2jserver.gameserver.instancemanager.CursedWeaponsManager; 
    2626import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    27 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     27import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    2828import com.l2jserver.gameserver.network.SystemMessageId; 
    2929import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestDispel.java

    r4731 r5146  
    1717import com.l2jserver.Config; 
    1818import com.l2jserver.gameserver.datatables.SkillTable; 
    19 import com.l2jserver.gameserver.model.L2Skill; 
    2019import com.l2jserver.gameserver.model.actor.L2Summon; 
    2120import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     21import com.l2jserver.gameserver.model.skills.L2Skill; 
    2222 
    2323/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestDropItem.java

    r5083 r5146  
    2121import com.l2jserver.gameserver.model.actor.L2Character; 
    2222import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    23 import com.l2jserver.gameserver.model.item.L2Item; 
    24 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    25 import com.l2jserver.gameserver.model.item.type.L2EtcItemType; 
    2623import com.l2jserver.gameserver.model.itemcontainer.PcInventory; 
     24import com.l2jserver.gameserver.model.items.L2Item; 
     25import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
     26import com.l2jserver.gameserver.model.items.type.L2EtcItemType; 
    2727import com.l2jserver.gameserver.network.SystemMessageId; 
    2828import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestEnchantItem.java

    r5087 r5146  
    2424import com.l2jserver.gameserver.model.EnchantItem; 
    2525import com.l2jserver.gameserver.model.EnchantScroll; 
    26 import com.l2jserver.gameserver.model.L2Skill; 
    2726import com.l2jserver.gameserver.model.L2World; 
    2827import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    29 import com.l2jserver.gameserver.model.item.L2Armor; 
    30 import com.l2jserver.gameserver.model.item.L2Item; 
    31 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     28import com.l2jserver.gameserver.model.items.L2Armor; 
     29import com.l2jserver.gameserver.model.items.L2Item; 
     30import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
     31import com.l2jserver.gameserver.model.skills.L2Skill; 
    3232import com.l2jserver.gameserver.network.SystemMessageId; 
    3333import com.l2jserver.gameserver.network.serverpackets.EnchantResult; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java

    r5093 r5146  
    1818import com.l2jserver.gameserver.model.Elementals; 
    1919import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    20 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     20import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    2121import com.l2jserver.gameserver.network.SystemMessageId; 
    2222import com.l2jserver.gameserver.network.serverpackets.ExAttributeEnchantResult; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkill.java

    r5093 r5146  
    2424import com.l2jserver.gameserver.model.L2EnchantSkillGroup.EnchantSkillDetail; 
    2525import com.l2jserver.gameserver.model.L2EnchantSkillLearn; 
    26 import com.l2jserver.gameserver.model.L2Skill; 
    2726import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    28 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2927import com.l2jserver.gameserver.model.itemcontainer.PcInventory; 
     28import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
     29import com.l2jserver.gameserver.model.skills.L2Skill; 
    3030import com.l2jserver.gameserver.network.SystemMessageId; 
    3131import com.l2jserver.gameserver.network.serverpackets.ExBrExtraUserInfo; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java

    r4733 r5146  
    1717import com.l2jserver.gameserver.datatables.EnchantGroupsTable; 
    1818import com.l2jserver.gameserver.datatables.SkillTable; 
    19 import com.l2jserver.gameserver.model.L2Skill; 
    2019import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     20import com.l2jserver.gameserver.model.skills.L2Skill; 
    2121import com.l2jserver.gameserver.network.serverpackets.ExEnchantSkillInfo; 
    2222 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkillRouteChange.java

    r5093 r5146  
    2424import com.l2jserver.gameserver.model.L2EnchantSkillGroup.EnchantSkillDetail; 
    2525import com.l2jserver.gameserver.model.L2EnchantSkillLearn; 
    26 import com.l2jserver.gameserver.model.L2Skill; 
    2726import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    28 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2927import com.l2jserver.gameserver.model.itemcontainer.PcInventory; 
     28import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
     29import com.l2jserver.gameserver.model.skills.L2Skill; 
    3030import com.l2jserver.gameserver.network.SystemMessageId; 
    3131import com.l2jserver.gameserver.network.serverpackets.ExBrExtraUserInfo; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkillSafe.java

    r5093 r5146  
    2424import com.l2jserver.gameserver.model.L2EnchantSkillGroup.EnchantSkillDetail; 
    2525import com.l2jserver.gameserver.model.L2EnchantSkillLearn; 
    26 import com.l2jserver.gameserver.model.L2Skill; 
    2726import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    28 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2927import com.l2jserver.gameserver.model.itemcontainer.PcInventory; 
     28import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
     29import com.l2jserver.gameserver.model.skills.L2Skill; 
    3030import com.l2jserver.gameserver.network.SystemMessageId; 
    3131import com.l2jserver.gameserver.network.serverpackets.ExBrExtraUserInfo; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkillUntrain.java

    r5093 r5146  
    2424import com.l2jserver.gameserver.model.L2EnchantSkillGroup.EnchantSkillDetail; 
    2525import com.l2jserver.gameserver.model.L2EnchantSkillLearn; 
    26 import com.l2jserver.gameserver.model.L2Skill; 
    2726import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    28 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2927import com.l2jserver.gameserver.model.itemcontainer.PcInventory; 
     28import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
     29import com.l2jserver.gameserver.model.skills.L2Skill; 
    3030import com.l2jserver.gameserver.network.SystemMessageId; 
    3131import com.l2jserver.gameserver.network.serverpackets.ExBrExtraUserInfo; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java

    r4733 r5146  
    1818 
    1919import com.l2jserver.gameserver.datatables.SkillTable; 
    20 import com.l2jserver.gameserver.model.L2Skill; 
    2120import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     21import com.l2jserver.gameserver.model.skills.L2Skill; 
    2222import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 
    2323import com.l2jserver.gameserver.network.serverpackets.ValidateLocation; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java

    r5093 r5146  
    1717import com.l2jserver.gameserver.model.Elementals; 
    1818import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    19 import com.l2jserver.gameserver.model.item.L2Item; 
    20 import com.l2jserver.gameserver.model.item.L2Weapon; 
    21 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     19import com.l2jserver.gameserver.model.items.L2Item; 
     20import com.l2jserver.gameserver.model.items.L2Weapon; 
     21import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    2222import com.l2jserver.gameserver.network.SystemMessageId; 
    2323import com.l2jserver.gameserver.network.serverpackets.ExBaseAttributeCancelResult; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestExRqItemLink.java

    r5083 r5146  
    2020import com.l2jserver.gameserver.model.L2Object; 
    2121import com.l2jserver.gameserver.model.L2World; 
    22 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     22import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    2323import com.l2jserver.gameserver.network.L2GameClient; 
    2424import com.l2jserver.gameserver.network.serverpackets.ExRpItemLink; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java

    r5093 r5146  
    1818import com.l2jserver.gameserver.model.EnchantItem; 
    1919import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    20 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     20import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    2121import com.l2jserver.gameserver.network.SystemMessageId; 
    2222import com.l2jserver.gameserver.network.serverpackets.ExPutEnchantSupportItemResult; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java

    r5087 r5146  
    1818import com.l2jserver.gameserver.model.EnchantScroll; 
    1919import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    20 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     20import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    2121import com.l2jserver.gameserver.network.SystemMessageId; 
    2222import com.l2jserver.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestGiveItemToPet.java

    r5083 r5146  
    2020import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    2121import com.l2jserver.gameserver.model.actor.instance.L2PetInstance; 
    22 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     22import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    2323import com.l2jserver.gameserver.network.SystemMessageId; 
    2424 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestHennaDrawList.java

    r5083 r5146  
    1717import com.l2jserver.gameserver.datatables.HennaTreeTable; 
    1818import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    19 import com.l2jserver.gameserver.model.item.instance.L2HennaInstance; 
     19import com.l2jserver.gameserver.model.items.instance.L2HennaInstance; 
    2020import com.l2jserver.gameserver.network.serverpackets.HennaEquipList; 
    2121 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestHennaEquip.java

    r5093 r5146  
    1919import com.l2jserver.gameserver.datatables.HennaTreeTable; 
    2020import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    21 import com.l2jserver.gameserver.model.item.L2Henna; 
    22 import com.l2jserver.gameserver.model.item.instance.L2HennaInstance; 
     21import com.l2jserver.gameserver.model.items.L2Henna; 
     22import com.l2jserver.gameserver.model.items.instance.L2HennaInstance; 
    2323import com.l2jserver.gameserver.network.SystemMessageId; 
    2424import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestHennaItemDrawInfo.java

    r5083 r5146  
    1717import com.l2jserver.gameserver.datatables.HennaTable; 
    1818import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    19 import com.l2jserver.gameserver.model.item.L2Henna; 
    20 import com.l2jserver.gameserver.model.item.instance.L2HennaInstance; 
     19import com.l2jserver.gameserver.model.items.L2Henna; 
     20import com.l2jserver.gameserver.model.items.instance.L2HennaInstance; 
    2121import com.l2jserver.gameserver.network.serverpackets.HennaItemDrawInfo; 
    2222 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java

    r5083 r5146  
    1717import com.l2jserver.gameserver.datatables.HennaTable; 
    1818import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    19 import com.l2jserver.gameserver.model.item.L2Henna; 
    20 import com.l2jserver.gameserver.model.item.instance.L2HennaInstance; 
     19import com.l2jserver.gameserver.model.items.L2Henna; 
     20import com.l2jserver.gameserver.model.items.instance.L2HennaInstance; 
    2121import com.l2jserver.gameserver.network.serverpackets.HennaItemRemoveInfo; 
    2222 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestHennaRemove.java

    r5083 r5146  
    1616 
    1717import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    18 import com.l2jserver.gameserver.model.item.instance.L2HennaInstance; 
     18import com.l2jserver.gameserver.model.items.instance.L2HennaInstance; 
    1919import com.l2jserver.gameserver.network.SystemMessageId; 
    2020 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestMagicSkillUse.java

    r5055 r5146  
    2121import com.l2jserver.gameserver.datatables.SkillTable; 
    2222import com.l2jserver.gameserver.model.L2CharPosition; 
    23 import com.l2jserver.gameserver.model.L2Skill; 
    2423import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    2524import com.l2jserver.gameserver.model.actor.position.PcPosition; 
     25import com.l2jserver.gameserver.model.skills.L2Skill; 
     26import com.l2jserver.gameserver.model.skills.L2SkillType; 
     27import com.l2jserver.gameserver.model.skills.targets.L2TargetType; 
    2628import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 
    27 import com.l2jserver.gameserver.templates.skills.L2SkillType; 
    28 import com.l2jserver.gameserver.templates.skills.L2TargetType; 
    2929 
    3030/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java

    r5093 r5146  
    2020import com.l2jserver.gameserver.model.actor.instance.L2BoatInstance; 
    2121import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    22 import com.l2jserver.gameserver.model.item.type.L2WeaponType; 
     22import com.l2jserver.gameserver.model.items.type.L2WeaponType; 
    2323import com.l2jserver.gameserver.network.SystemMessageId; 
    2424import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestPackageSend.java

    r5093 r5146  
    1818 
    1919import com.l2jserver.Config; 
    20 import com.l2jserver.gameserver.model.ItemHolder; 
    2120import com.l2jserver.gameserver.model.actor.L2Npc; 
    2221import com.l2jserver.gameserver.model.actor.instance.L2NpcInstance; 
    2322import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    24 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     23import com.l2jserver.gameserver.model.holders.ItemHolder; 
    2524import com.l2jserver.gameserver.model.itemcontainer.ItemContainer; 
    2625import com.l2jserver.gameserver.model.itemcontainer.PcFreight; 
    2726import com.l2jserver.gameserver.model.itemcontainer.PcInventory; 
     27import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    2828import com.l2jserver.gameserver.network.SystemMessageId; 
    2929import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestPackageSendableItemList.java

    r5083 r5146  
    1515package com.l2jserver.gameserver.network.clientpackets; 
    1616 
    17 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     17import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    1818import com.l2jserver.gameserver.network.serverpackets.PackageSendableList; 
    1919 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestPetGetItem.java

    r5083 r5146  
    2020import com.l2jserver.gameserver.model.L2World; 
    2121import com.l2jserver.gameserver.model.actor.instance.L2PetInstance; 
    22 import com.l2jserver.gameserver.model.actor.instance.L2SummonInstance; 
    23 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     22import com.l2jserver.gameserver.model.actor.instance.L2ServitorInstance; 
     23import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    2424import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 
    2525 
    … …  
    5656                } 
    5757                 
    58                 if(getClient().getActiveChar().getPet() instanceof L2SummonInstance) 
     58                if(getClient().getActiveChar().getPet() instanceof L2ServitorInstance) 
    5959                { 
    6060                        sendPacket(ActionFailed.STATIC_PACKET); 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestPetUseItem.java

    r5083 r5146  
    2323import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    2424import com.l2jserver.gameserver.model.actor.instance.L2PetInstance; 
    25 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     25import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    2626import com.l2jserver.gameserver.network.SystemMessageId; 
    2727import com.l2jserver.gameserver.network.serverpackets.PetItemList; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestPostAttachment.java

    r5093 r5146  
    2424import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    2525import com.l2jserver.gameserver.model.entity.Message; 
    26 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    27 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance.ItemLocation; 
    2826import com.l2jserver.gameserver.model.itemcontainer.ItemContainer; 
     27import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
     28import com.l2jserver.gameserver.model.items.instance.L2ItemInstance.ItemLocation; 
    2929import com.l2jserver.gameserver.network.SystemMessageId; 
    3030import com.l2jserver.gameserver.network.serverpackets.ExChangePostState; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestPreviewItem.java

    r5126 r5146  
    3232import com.l2jserver.gameserver.model.actor.instance.L2MerchantInstance; 
    3333import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    34 import com.l2jserver.gameserver.model.item.L2Armor; 
    35 import com.l2jserver.gameserver.model.item.L2Item; 
    36 import com.l2jserver.gameserver.model.item.L2Weapon; 
    37 import com.l2jserver.gameserver.model.item.type.L2ArmorType; 
    38 import com.l2jserver.gameserver.model.item.type.L2WeaponType; 
    3934import com.l2jserver.gameserver.model.itemcontainer.Inventory; 
    4035import com.l2jserver.gameserver.model.itemcontainer.PcInventory; 
     36import com.l2jserver.gameserver.model.items.L2Armor; 
     37import com.l2jserver.gameserver.model.items.L2Item; 
     38import com.l2jserver.gameserver.model.items.L2Weapon; 
     39import com.l2jserver.gameserver.model.items.type.L2ArmorType; 
     40import com.l2jserver.gameserver.model.items.type.L2WeaponType; 
    4141import com.l2jserver.gameserver.network.SystemMessageId; 
    4242import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestProcureCropList.java

    r5093 r5146  
    2727import com.l2jserver.gameserver.model.actor.instance.L2ManorManagerInstance; 
    2828import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    29 import com.l2jserver.gameserver.model.item.L2Item; 
    30 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     29import com.l2jserver.gameserver.model.items.L2Item; 
     30import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    3131import com.l2jserver.gameserver.network.SystemMessageId; 
    3232import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestRefine.java

    r5093 r5146  
    1818import com.l2jserver.gameserver.model.L2Augmentation; 
    1919import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    20 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     20import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    2121import com.l2jserver.gameserver.network.SystemMessageId; 
    2222import com.l2jserver.gameserver.network.serverpackets.ExVariationResult; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestRefineCancel.java

    r5093 r5146  
    1717import com.l2jserver.Config; 
    1818import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    19 import com.l2jserver.gameserver.model.item.L2Item; 
    20 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     19import com.l2jserver.gameserver.model.items.L2Item; 
     20import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    2121import com.l2jserver.gameserver.network.SystemMessageId; 
    2222import com.l2jserver.gameserver.network.serverpackets.ExVariationCancelResult; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestRefundItem.java

    r5083 r5146  
    2828import com.l2jserver.gameserver.model.actor.instance.L2MerchantSummonInstance; 
    2929import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    30 import com.l2jserver.gameserver.model.item.L2Item; 
    31 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     30import com.l2jserver.gameserver.model.items.L2Item; 
     31import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    3232import com.l2jserver.gameserver.network.SystemMessageId; 
    3333import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestSaveInventoryOrder.java

    r5083 r5146  
    1919 
    2020import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    21 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    22 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance.ItemLocation; 
    2321import com.l2jserver.gameserver.model.itemcontainer.Inventory; 
     22import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
     23import com.l2jserver.gameserver.model.items.instance.L2ItemInstance.ItemLocation; 
    2424 
    2525/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestSellItem.java

    r5083 r5146  
    2828import com.l2jserver.gameserver.model.actor.instance.L2MerchantSummonInstance; 
    2929import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    30 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     30import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    3131import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 
    3232import com.l2jserver.gameserver.network.serverpackets.ExBuySellListPacket; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestSendPost.java

    r5093 r5146  
    2929import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    3030import com.l2jserver.gameserver.model.entity.Message; 
    31 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    3231import com.l2jserver.gameserver.model.itemcontainer.Mail; 
     32import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    3333import com.l2jserver.gameserver.network.SystemMessageId; 
    3434import com.l2jserver.gameserver.network.serverpackets.ExNoticePostSent; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestUnEquipItem.java

    r5083 r5146  
    1919import com.l2jserver.Config; 
    2020import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    21 import com.l2jserver.gameserver.model.item.L2EtcItem; 
    22 import com.l2jserver.gameserver.model.item.L2Item; 
    23 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     21import com.l2jserver.gameserver.model.items.L2EtcItem; 
     22import com.l2jserver.gameserver.model.items.L2Item; 
     23import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    2424import com.l2jserver.gameserver.network.SystemMessageId; 
    2525import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/Say2.java

    r5093 r5146  
    2525import com.l2jserver.gameserver.model.L2World; 
    2626import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    27 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     27import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    2828import com.l2jserver.gameserver.network.SystemMessageId; 
    2929import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/SendWareHouseDepositList.java

    r5083 r5146  
    2222import com.l2jserver.gameserver.model.actor.L2Npc; 
    2323import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    24 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2524import com.l2jserver.gameserver.model.itemcontainer.ItemContainer; 
    2625import com.l2jserver.gameserver.model.itemcontainer.PcWarehouse; 
     26import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    2727import com.l2jserver.gameserver.network.SystemMessageId; 
    2828import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/SendWareHouseWithDrawList.java

    r5134 r5146  
    1717import com.l2jserver.Config; 
    1818import com.l2jserver.gameserver.model.ClanWarehouse; 
    19 import com.l2jserver.gameserver.model.ItemHolder; 
    2019import com.l2jserver.gameserver.model.L2Clan; 
    2120import com.l2jserver.gameserver.model.actor.L2Npc; 
    2221import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    23 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     22import com.l2jserver.gameserver.model.holders.ItemHolder; 
    2423import com.l2jserver.gameserver.model.itemcontainer.ItemContainer; 
    2524import com.l2jserver.gameserver.model.itemcontainer.PcWarehouse; 
     25import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    2626import com.l2jserver.gameserver.network.SystemMessageId; 
    2727import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/UseItem.java

    r5083 r5146  
    2828import com.l2jserver.gameserver.handler.ItemHandler; 
    2929import com.l2jserver.gameserver.instancemanager.FortSiegeManager; 
    30 import com.l2jserver.gameserver.model.L2Skill; 
    3130import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    3231import com.l2jserver.gameserver.model.base.Race; 
    33 import com.l2jserver.gameserver.model.item.L2Item; 
    34 import com.l2jserver.gameserver.model.item.L2Weapon; 
    35 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    36 import com.l2jserver.gameserver.model.item.type.L2ArmorType; 
    37 import com.l2jserver.gameserver.model.item.type.L2WeaponType; 
     32import com.l2jserver.gameserver.model.holders.SkillHolder; 
    3833import com.l2jserver.gameserver.model.itemcontainer.Inventory; 
     34import com.l2jserver.gameserver.model.items.L2Item; 
     35import com.l2jserver.gameserver.model.items.L2Weapon; 
     36import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
     37import com.l2jserver.gameserver.model.items.type.L2ArmorType; 
     38import com.l2jserver.gameserver.model.items.type.L2WeaponType; 
     39import com.l2jserver.gameserver.model.skills.L2Skill; 
     40import com.l2jserver.gameserver.model.skills.L2SkillType; 
    3941import com.l2jserver.gameserver.network.SystemMessageId; 
    4042import com.l2jserver.gameserver.network.serverpackets.ActionFailed; 
    … …  
    4244import com.l2jserver.gameserver.network.serverpackets.ShowCalculator; 
    4345import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    44 import com.l2jserver.gameserver.skills.SkillHolder; 
    45 import com.l2jserver.gameserver.templates.skills.L2SkillType; 
    4646 
    4747/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/AbstractNpcInfo.java

    r5098 r5146  
    2626import com.l2jserver.gameserver.model.actor.instance.L2NpcInstance; 
    2727import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    28 import com.l2jserver.gameserver.skills.AbnormalEffect; 
     28import com.l2jserver.gameserver.model.effects.AbnormalEffect; 
    2929 
    3030/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/CharInfo.java

    r5138 r5146  
    2222import com.l2jserver.gameserver.model.actor.L2Decoy; 
    2323import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     24import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
     25import com.l2jserver.gameserver.model.effects.AbnormalEffect; 
    2426import com.l2jserver.gameserver.model.itemcontainer.Inventory; 
    25 import com.l2jserver.gameserver.skills.AbnormalEffect; 
    26 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    2727 
    2828 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/ConfirmDlg.java

    r5134 r5146  
    1717import javolution.util.FastList; 
    1818 
    19 import com.l2jserver.gameserver.model.L2Effect; 
    20 import com.l2jserver.gameserver.model.L2Skill; 
    2119import com.l2jserver.gameserver.model.actor.L2Character; 
    2220import com.l2jserver.gameserver.model.actor.L2Npc; 
    2321import com.l2jserver.gameserver.model.actor.L2Summon; 
    2422import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    25 import com.l2jserver.gameserver.model.item.L2Item; 
    26 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     23import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
     24import com.l2jserver.gameserver.model.effects.L2Effect; 
     25import com.l2jserver.gameserver.model.items.L2Item; 
     26import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
     27import com.l2jserver.gameserver.model.skills.L2Skill; 
    2728import com.l2jserver.gameserver.network.SystemMessageId; 
    28 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    2929 
    3030/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/DropItem.java

    r5138 r5146  
    1515package com.l2jserver.gameserver.network.serverpackets; 
    1616 
    17 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     17import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    1818 
    1919/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/EquipUpdate.java

    r5134 r5146  
    1818 
    1919import com.l2jserver.Config; 
    20 import com.l2jserver.gameserver.model.item.L2Item; 
    21 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     20import com.l2jserver.gameserver.model.items.L2Item; 
     21import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    2222 
    2323 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/ExBuySellListPacket.java

    r5138 r5146  
    2222import com.l2jserver.gameserver.model.L2TradeList.L2TradeItem; 
    2323import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    24 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     24import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    2525 
    2626/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java

    r5138 r5146  
    1616 
    1717import com.l2jserver.gameserver.model.Elementals; 
    18 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     18import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    1919 
    2020 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java

    r5138 r5146  
    1515package com.l2jserver.gameserver.network.serverpackets; 
    1616 
    17 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     17import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    1818 
    1919/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/ExQuestItemList.java

    r5138 r5146  
    1717import javolution.util.FastList; 
    1818 
    19 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2019import com.l2jserver.gameserver.model.itemcontainer.PcInventory; 
     20import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    2121 
    2222/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/ExReplyPostItemList.java

    r5138 r5146  
    1616 
    1717import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    18 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     18import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    1919 
    2020/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/ExReplyReceivedPost.java

    r5138 r5146  
    1818 
    1919import com.l2jserver.gameserver.model.entity.Message; 
    20 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2120import com.l2jserver.gameserver.model.itemcontainer.ItemContainer; 
     21import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    2222 
    2323/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/ExReplySentPost.java

    r5138 r5146  
    1818 
    1919import com.l2jserver.gameserver.model.entity.Message; 
    20 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2120import com.l2jserver.gameserver.model.itemcontainer.ItemContainer; 
     21import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    2222 
    2323/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/ExRpItemLink.java

    r5138 r5146  
    1515package com.l2jserver.gameserver.network.serverpackets; 
    1616 
    17 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     17import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    1818 
    1919/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java

    r5083 r5146  
    1616 
    1717import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    18 import com.l2jserver.gameserver.model.item.L2Item; 
    19 import com.l2jserver.gameserver.model.item.L2Weapon; 
    20 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     18import com.l2jserver.gameserver.model.items.L2Item; 
     19import com.l2jserver.gameserver.model.items.L2Weapon; 
     20import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    2121 
    2222public class ExShowBaseAttributeCancelWindow extends L2GameServerPacket 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/ExShowSellCropList.java

    r5138 r5146  
    2424import com.l2jserver.gameserver.model.L2Manor; 
    2525import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    26 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     26import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    2727 
    2828/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/ExStorageMaxCount.java

    r5134 r5146  
    1717import com.l2jserver.Config; 
    1818import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    19 import com.l2jserver.gameserver.skills.Stats; 
     19import com.l2jserver.gameserver.model.stats.Stats; 
    2020 
    2121/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/GMHennaInfo.java

    r5083 r5146  
    1616 
    1717import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    18 import com.l2jserver.gameserver.model.item.instance.L2HennaInstance; 
     18import com.l2jserver.gameserver.model.items.instance.L2HennaInstance; 
    1919 
    2020/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/GMViewItemList.java

    r5138 r5146  
    1717import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    1818import com.l2jserver.gameserver.model.actor.instance.L2PetInstance; 
    19 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     19import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    2020 
    2121/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/GMViewSkillInfo.java

    r5134 r5146  
    1717 
    1818import com.l2jserver.gameserver.datatables.SkillTable; 
    19 import com.l2jserver.gameserver.model.L2Skill; 
    2019import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     20import com.l2jserver.gameserver.model.skills.L2Skill; 
    2121 
    2222public class GMViewSkillInfo extends L2GameServerPacket 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java

    r5138 r5146  
    1717import com.l2jserver.gameserver.model.L2Clan; 
    1818import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    19 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     19import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    2020 
    2121/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/GetItem.java

    r5083 r5146  
    1515package com.l2jserver.gameserver.network.serverpackets; 
    1616 
    17 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     17import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    1818 
    1919/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/HennaEquipList.java

    r5134 r5146  
    1616 
    1717import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    18 import com.l2jserver.gameserver.model.item.instance.L2HennaInstance; 
     18import com.l2jserver.gameserver.model.items.instance.L2HennaInstance; 
    1919 
    2020public class HennaEquipList extends L2GameServerPacket 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/HennaInfo.java

    r5134 r5146  
    1616 
    1717import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    18 import com.l2jserver.gameserver.model.item.instance.L2HennaInstance; 
     18import com.l2jserver.gameserver.model.items.instance.L2HennaInstance; 
    1919 
    2020public final class HennaInfo extends L2GameServerPacket 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/HennaItemDrawInfo.java

    r5134 r5146  
    1616 
    1717import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    18 import com.l2jserver.gameserver.model.item.instance.L2HennaInstance; 
     18import com.l2jserver.gameserver.model.items.instance.L2HennaInstance; 
    1919 
    2020public class HennaItemDrawInfo extends L2GameServerPacket 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/HennaItemRemoveInfo.java

    r5134 r5146  
    1616 
    1717import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    18 import com.l2jserver.gameserver.model.item.instance.L2HennaInstance; 
     18import com.l2jserver.gameserver.model.items.instance.L2HennaInstance; 
    1919 
    2020public class HennaItemRemoveInfo extends L2GameServerPacket 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/HennaRemoveList.java

    r5083 r5146  
    1616 
    1717import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    18 import com.l2jserver.gameserver.model.item.instance.L2HennaInstance; 
     18import com.l2jserver.gameserver.model.items.instance.L2HennaInstance; 
    1919 
    2020public class HennaRemoveList extends L2GameServerPacket 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/InventoryUpdate.java

    r5138 r5146  
    2222import com.l2jserver.Config; 
    2323import com.l2jserver.gameserver.model.ItemInfo; 
    24 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     24import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    2525 
    2626/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/ItemList.java

    r5138 r5146  
    2020 
    2121import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    22 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    2322import com.l2jserver.gameserver.model.itemcontainer.PcInventory; 
     23import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    2424 
    2525 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/NewCharacterSuccess.java

    r5010 r5146  
    1919import javolution.util.FastList; 
    2020 
    21 import com.l2jserver.gameserver.templates.chars.L2PcTemplate; 
     21import com.l2jserver.gameserver.model.actor.templates.L2PcTemplate; 
    2222 
    2323/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/PackageSendableList.java

    r5138 r5146  
    1616 
    1717import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    18 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     18import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    1919 
    2020/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/PartySpelled.java

    r5134 r5146  
    2121import com.l2jserver.gameserver.model.actor.L2Character; 
    2222import com.l2jserver.gameserver.model.actor.instance.L2PetInstance; 
    23 import com.l2jserver.gameserver.model.actor.instance.L2SummonInstance; 
     23import com.l2jserver.gameserver.model.actor.instance.L2ServitorInstance; 
    2424 
    2525/** 
    … …  
    5858        { 
    5959                writeC(0xf4); 
    60                 writeD(_activeChar instanceof L2SummonInstance ? 2 : _activeChar instanceof L2PetInstance ? 1 : 0); 
     60                writeD(_activeChar instanceof L2ServitorInstance ? 2 : _activeChar instanceof L2PetInstance ? 1 : 0); 
    6161                writeD(_activeChar.getObjectId()); 
    6262                writeD(_effects.size()); 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/PetInfo.java

    r5013 r5146  
    1717import com.l2jserver.gameserver.model.actor.L2Summon; 
    1818import com.l2jserver.gameserver.model.actor.instance.L2PetInstance; 
    19 import com.l2jserver.gameserver.model.actor.instance.L2SummonInstance; 
     19import com.l2jserver.gameserver.model.actor.instance.L2ServitorInstance; 
    2020 
    2121/** 
    … …  
    6868                        _maxFed = pet.getMaxFed(); //max fed it can be 
    6969                } 
    70                 else if (_summon instanceof L2SummonInstance) 
     70                else if (_summon instanceof L2ServitorInstance) 
    7171                { 
    72                         L2SummonInstance sum = (L2SummonInstance)_summon; 
     72                        L2ServitorInstance sum = (L2ServitorInstance)_summon; 
    7373                        _curFed = sum.getTimeRemaining(); 
    7474                        _maxFed = sum.getTotalLifeTime(); 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/PetInventoryUpdate.java

    r5138 r5146  
    2222import com.l2jserver.Config; 
    2323import com.l2jserver.gameserver.model.ItemInfo; 
    24 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     24import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    2525 
    2626/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/PetItemList.java

    r5138 r5146  
    1919import com.l2jserver.Config; 
    2020import com.l2jserver.gameserver.model.actor.instance.L2PetInstance; 
    21 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     21import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    2222 
    2323 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/PetStatusUpdate.java

    r4417 r5146  
    1717import com.l2jserver.gameserver.model.actor.L2Summon; 
    1818import com.l2jserver.gameserver.model.actor.instance.L2PetInstance; 
    19 import com.l2jserver.gameserver.model.actor.instance.L2SummonInstance; 
     19import com.l2jserver.gameserver.model.actor.instance.L2ServitorInstance; 
    2020 
    2121/** 
    … …  
    4343                        _maxFed = pet.getMaxFed(); //max fed it can be 
    4444                } 
    45                 else if (_summon instanceof L2SummonInstance) 
     45                else if (_summon instanceof L2ServitorInstance) 
    4646                { 
    47                         L2SummonInstance sum = (L2SummonInstance)_summon; 
     47                        L2ServitorInstance sum = (L2ServitorInstance)_summon; 
    4848                        _curFed = sum.getTimeRemaining(); 
    4949                        _maxFed = sum.getTotalLifeTime(); 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/PledgeSkillList.java

    r5042 r5146  
    1616 
    1717import com.l2jserver.gameserver.model.L2Clan; 
    18 import com.l2jserver.gameserver.model.L2Skill; 
     18import com.l2jserver.gameserver.model.skills.L2Skill; 
    1919 
    2020/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/PrivateStoreManageListBuy.java

    r5138 r5146  
    1717import com.l2jserver.gameserver.model.TradeItem; 
    1818import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    19 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     19import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    2020 
    2121/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/SellList.java

    r5138 r5146  
    2323import com.l2jserver.gameserver.model.actor.instance.L2MerchantInstance; 
    2424import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    25 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     25import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    2626 
    2727/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/SellListProcure.java

    r5138 r5146  
    2424import com.l2jserver.gameserver.instancemanager.CastleManorManager.CropProcure; 
    2525import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    26 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     26import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    2727 
    2828public class SellListProcure extends L2GameServerPacket 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/ShopPreviewList.java

    r5134 r5146  
    2020import com.l2jserver.gameserver.model.L2TradeList; 
    2121import com.l2jserver.gameserver.model.L2TradeList.L2TradeItem; 
    22 import com.l2jserver.gameserver.model.item.L2Item; 
     22import com.l2jserver.gameserver.model.items.L2Item; 
    2323 
    2424 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/SortedWareHouseWithdrawalList.java

    r5138 r5146  
    2525import com.l2jserver.gameserver.model.L2RecipeList; 
    2626import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    27 import com.l2jserver.gameserver.model.item.L2Item; 
    28 import com.l2jserver.gameserver.model.item.L2WarehouseItem; 
    29 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    30 import com.l2jserver.gameserver.model.item.type.L2EtcItemType; 
     27import com.l2jserver.gameserver.model.items.L2Item; 
     28import com.l2jserver.gameserver.model.items.L2WarehouseItem; 
     29import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
     30import com.l2jserver.gameserver.model.items.type.L2EtcItemType; 
    3131 
    3232/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/SpawnItem.java

    r5138 r5146  
    1616 
    1717import com.l2jserver.gameserver.model.L2Object; 
    18 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     18import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    1919 
    2020/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/SystemMessage.java

    r5138 r5146  
    2626import com.l2jserver.gameserver.instancemanager.CastleManager; 
    2727import com.l2jserver.gameserver.model.Elementals; 
    28 import com.l2jserver.gameserver.model.L2Effect; 
    29 import com.l2jserver.gameserver.model.L2Skill; 
    3028import com.l2jserver.gameserver.model.actor.L2Character; 
    3129import com.l2jserver.gameserver.model.actor.L2Npc; 
    3230import com.l2jserver.gameserver.model.actor.L2Summon; 
    3331import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     32import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
     33import com.l2jserver.gameserver.model.effects.L2Effect; 
    3434import com.l2jserver.gameserver.model.entity.Castle; 
    35 import com.l2jserver.gameserver.model.item.L2Item; 
    36 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     35import com.l2jserver.gameserver.model.items.L2Item; 
     36import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
     37import com.l2jserver.gameserver.model.skills.L2Skill; 
    3738import com.l2jserver.gameserver.network.SystemMessageId; 
    3839import com.l2jserver.gameserver.network.SystemMessageId.SMLocalisation; 
    39 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    4040 
    4141public final class SystemMessage extends L2GameServerPacket 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/TradeStart.java

    r5138 r5146  
    1717import com.l2jserver.Config; 
    1818import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    19 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     19import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    2020 
    2121/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/UserInfo.java

    r5138 r5146  
    2424import com.l2jserver.gameserver.model.actor.L2Summon; 
    2525import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     26import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
     27import com.l2jserver.gameserver.model.effects.AbnormalEffect; 
    2628import com.l2jserver.gameserver.model.itemcontainer.Inventory; 
    27 import com.l2jserver.gameserver.skills.AbnormalEffect; 
    28 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    2929 
    3030/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/WareHouseDepositList.java

    r5138 r5146  
    2121import com.l2jserver.Config; 
    2222import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    23 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     23import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    2424 
    2525/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/WareHouseWithdrawalList.java

    r5138 r5146  
    1919import com.l2jserver.Config; 
    2020import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    21 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     21import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    2222 
    2323 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/pathfinding/cellnodes/CellPathFinding.java

    r5083 r5146  
    2727import com.l2jserver.gameserver.idfactory.IdFactory; 
    2828import com.l2jserver.gameserver.model.L2World; 
    29 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
    3029import com.l2jserver.gameserver.model.itemcontainer.PcInventory; 
     30import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    3131import com.l2jserver.gameserver.pathfinding.AbstractNode; 
    3232import com.l2jserver.gameserver.pathfinding.AbstractNodeLoc; 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/script/faenor/FaenorInterface.java

    r5013 r5146  
    2525import com.l2jserver.gameserver.model.L2DropCategory; 
    2626import com.l2jserver.gameserver.model.L2DropData; 
     27import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    2728import com.l2jserver.gameserver.script.DateRange; 
    2829import com.l2jserver.gameserver.script.EngineInterface; 
    29 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    3030 
    3131/** 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/util/Evolve.java

    r5093 r5146  
    3131import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    3232import com.l2jserver.gameserver.model.actor.instance.L2PetInstance; 
    33 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     33import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
     34import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    3435import com.l2jserver.gameserver.network.SystemMessageId; 
    3536import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate; 
    … …  
    3839import com.l2jserver.gameserver.network.serverpackets.StatusUpdate; 
    3940import com.l2jserver.gameserver.network.serverpackets.SystemMessage; 
    40 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
    4141 
    4242public final class Evolve 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/util/MinionList.java

    r4981 r5146  
    3030import com.l2jserver.gameserver.model.actor.L2Character; 
    3131import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance; 
    32 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate; 
     32import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; 
    3333import com.l2jserver.util.Rnd; 
    3434 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/log/DamageFormatter.java

    r4642 r5146  
    2020import java.util.logging.LogRecord; 
    2121 
    22 import com.l2jserver.gameserver.model.L2Skill; 
    2322import com.l2jserver.gameserver.model.actor.L2Attackable; 
    2423import com.l2jserver.gameserver.model.actor.L2Character; 
    2524import com.l2jserver.gameserver.model.actor.L2Summon; 
    2625import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
     26import com.l2jserver.gameserver.model.skills.L2Skill; 
    2727import com.l2jserver.util.StringUtil; 
    2828 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/log/EnchantFormatter.java

    r5083 r5146  
    2020import java.util.logging.LogRecord; 
    2121 
    22 import com.l2jserver.gameserver.model.L2Skill; 
    2322import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; 
    24 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     23import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
     24import com.l2jserver.gameserver.model.skills.L2Skill; 
    2525import com.l2jserver.util.StringUtil; 
    2626 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/log/ItemFilter.java

    r5083 r5146  
    1818import java.util.logging.LogRecord; 
    1919 
    20 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     20import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    2121 
    2222 

  • branches/unstable/L2J_Server_BETA/java/com/l2jserver/log/ItemLogFormatter.java

    r5083 r5146  
    2020import java.util.logging.LogRecord; 
    2121 
    22 import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; 
     22import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; 
    2323import com.l2jserver.util.StringUtil; 
    2424 

  • branches/unstable/L2J_Server_BETA/misc/log.cfg

    r4899 r5146  
    149149com.l2jserver.gameserver.network.clientpackets.level = FINER 
    150150com.l2jserver.gameserver.model.actor.L2Character.level = FINER 
    151 com.l2jserver.gameserver.skills.SkillsEngine.level = INFO 
     151com.l2jserver.gameserver.engines.DocumentEngine.level = INFO 
    152152 
    153153# Alt Privileges Administration 
Note: See TracChangeset for help on using the changeset viewer.