From d9a2badd2d7a4684589cb7bb04270651381e324d Mon Sep 17 00:00:00 2001 From: Rogiel Date: Sun, 16 Oct 2011 15:27:18 -0200 Subject: [PATCH] Implement the SimpleEffectService The EffectService allows effect applying to Actors and its children objects. --- .../com/l2jserver/model/AbstractModel.java | 8 +- .../main/java/com/l2jserver/model/Model.java | 8 +- .../l2jserver/model/id/AbstractModelID.java | 8 +- .../main/java/com/l2jserver/model/id/ID.java | 8 +- .../model/id/compound/AbstractCompoundID.java | 8 +- .../object/allocator/BitSetIDAllocator.java | 8 +- .../id/object/allocator/IDAllocator.java | 8 +- .../allocator/IDAllocatorException.java | 8 +- .../model/id/provider/CompoundIDProvider.java | 8 +- .../model/id/provider/IDProvider.java | 8 +- .../l2jserver/service/AbstractService.java | 8 +- .../java/com/l2jserver/service/Service.java | 8 +- .../service/ServiceConfiguration.java | 8 +- .../l2jserver/service/ServiceException.java | 8 +- .../com/l2jserver/service/ServiceManager.java | 8 +- .../service/ServiceRestartException.java | 8 +- .../service/ServiceStartException.java | 8 +- .../service/ServiceStopException.java | 8 +- .../l2jserver/service/cache/CacheService.java | 8 +- .../l2jserver/service/cache/Cacheable.java | 8 +- .../service/cache/EhCacheService.java | 8 +- .../service/cache/IgnoreCaching.java | 8 +- .../service/cache/MethodInvocation.java | 8 +- .../service/cache/SoftCacheService.java | 8 +- .../service/cache/WeakCacheService.java | 8 +- .../service/configuration/Configuration.java | 8 +- .../configuration/ConfigurationService.java | 8 +- .../ProxyConfigurationService.java | 8 +- .../XMLConfigurationService.java | 8 +- .../service/core/ExceptionService.java | 8 +- .../service/core/Log4JLoggingService.java | 8 +- .../service/core/LoggingService.java | 8 +- .../service/core/threading/AsyncFuture.java | 8 +- .../core/threading/ScheduledAsyncFuture.java | 8 +- .../service/core/threading/ThreadPool.java | 8 +- .../service/core/threading/ThreadService.java | 8 +- .../core/threading/ThreadServiceImpl.java | 8 +- .../service/core/vfs/Java7VFSService.java | 8 +- .../service/core/vfs/VFSService.java | 8 +- .../service/database/AbstractDAO.java | 8 +- .../database/AbstractJDBCDatabaseService.java | 8 +- .../AbstractOrientDatabaseService.java | 8 +- .../service/database/DataAccessObject.java | 8 +- .../service/database/DatabaseService.java | 8 +- .../database/jdbc/AbstractJDBCDAO.java | 8 +- .../orientdb/AbstractOrientDBDAO.java | 8 +- .../com/l2jserver/util/ArrayIterator.java | 8 +- .../java/com/l2jserver/util/BufferUtils.java | 8 +- .../java/com/l2jserver/util/RGBColor.java | 8 +- .../l2jserver/util/exception/L2Exception.java | 8 +- .../util/factory/CollectionFactory.java | 8 +- .../l2jserver/util/geometry/Coordinate.java | 8 +- .../com/l2jserver/util/geometry/Point.java | 8 +- .../com/l2jserver/util/geometry/Point3D.java | 8 +- .../util/transformer/Transformer.java | 8 +- .../util/transformer/TransformerFactory.java | 8 +- .../transformer/impl/BooleanTransformer.java | 8 +- .../transformer/impl/ByteTransformer.java | 8 +- .../transformer/impl/ClassTransformer.java | 8 +- .../transformer/impl/DoubleTransformer.java | 8 +- .../transformer/impl/FileTransformer.java | 8 +- .../transformer/impl/FloatTransformer.java | 8 +- .../impl/InetSocketAddressTransformer.java | 8 +- .../transformer/impl/IntegerTransformer.java | 8 +- .../transformer/impl/LongTransformer.java | 8 +- .../transformer/impl/PathTransformer.java | 8 +- .../transformer/impl/ShortTransformer.java | 8 +- .../util/transformer/impl/URITransformer.java | 8 +- .../util/transformer/impl/URLTransformer.java | 8 +- .../id/allocator/BitSetIDAllocatorTest.java | 8 +- .../service/cache/SimpleCacheServiceTest.java | 8 +- .../XMLConfigurationServiceTest.java | 8 +- .../ai/com/l2jserver/game/ai/MonsterAI.java | 8 +- .../ai/com/l2jserver/game/ai/NPCAI.java | 8 +- .../java/com/l2jserver/GameServerModule.java | 8 +- .../com/l2jserver/GeneralConfiguration.java | 8 +- .../main/java/com/l2jserver/L2JConstant.java | 8 +- .../java/com/l2jserver/L2JGameServer.java | 8 +- .../java/com/l2jserver/L2JGameServerMain.java | 8 +- .../l2jserver/game/net/Lineage2Client.java | 10 +- .../game/net/Lineage2CryptographyKey.java | 8 +- .../game/net/Lineage2PipelineFactory.java | 8 +- .../l2jserver/game/net/Lineage2Session.java | 8 +- .../l2jserver/game/net/ProtocolVersion.java | 8 +- .../game/net/codec/Lineage2Decrypter.java | 8 +- .../game/net/codec/Lineage2Encrypter.java | 8 +- .../game/net/codec/Lineage2FrameDecoder.java | 8 +- .../game/net/codec/Lineage2FrameEncoder.java | 8 +- .../game/net/codec/Lineage2PacketReader.java | 8 +- .../game/net/codec/Lineage2PacketWriter.java | 8 +- .../net/handler/Lineage2PacketHandler.java | 8 +- .../game/net/packet/AbstractClientPacket.java | 8 +- .../game/net/packet/AbstractServerPacket.java | 8 +- .../game/net/packet/ClientPacket.java | 8 +- .../game/net/packet/ClientPacketModule.java | 8 +- .../com/l2jserver/game/net/packet/Packet.java | 8 +- .../game/net/packet/PacketModule.java | 8 +- .../game/net/packet/ServerPacket.java | 8 +- .../game/net/packet/ServerPacketModule.java | 8 +- .../game/net/packet/client/CM_ACTION_USE.java | 8 +- .../net/packet/client/CM_ADMIN_COMMAND.java | 8 +- .../game/net/packet/client/CM_ATTACK.java | 8 +- .../game/net/packet/client/CM_AUTH_LOGIN.java | 8 +- .../game/net/packet/client/CM_BYPASS.java | 8 +- .../net/packet/client/CM_CHAR_ACTION.java | 8 +- .../net/packet/client/CM_CHAR_APPEARING.java | 8 +- .../net/packet/client/CM_CHAR_CREATE.java | 8 +- .../game/net/packet/client/CM_CHAR_MOVE.java | 8 +- .../net/packet/client/CM_CHAR_OPEN_MAP.java | 8 +- .../net/packet/client/CM_CHAR_POSITION.java | 8 +- .../packet/client/CM_CHAR_REQ_INVENTORY.java | 8 +- .../net/packet/client/CM_CHAR_SELECT.java | 8 +- .../game/net/packet/client/CM_CHAT.java | 8 +- .../net/packet/client/CM_ENTER_WORLD.java | 8 +- .../client/CM_EXT_REQ_ALL_FORTRESS_INFO.java | 8 +- .../packet/client/CM_EXT_REQ_KEY_MAPPING.java | 8 +- .../packet/client/CM_EXT_REQ_MANOR_LIST.java | 8 +- .../client/CM_EXT_REQ_SHORTCUT_REGISTRY.java | 8 +- .../game/net/packet/client/CM_GG_KEY.java | 8 +- .../game/net/packet/client/CM_GOTO_LOBBY.java | 8 +- .../game/net/packet/client/CM_LOGOUT.java | 8 +- .../packet/client/CM_PROTOCOL_VERSION.java | 8 +- .../client/CM_REQUEST_CHAR_TEMPLATE.java | 10 +- .../game/net/packet/client/CM_RESTART.java | 8 +- .../net/packet/server/SM_ACTION_FAILED.java | 8 +- .../net/packet/server/SM_ACTOR_POSITION.java | 8 +- .../game/net/packet/server/SM_ATTACK.java | 8 +- .../packet/server/SM_CHAR_CREATE_FAIL.java | 8 +- .../net/packet/server/SM_CHAR_CREATE_OK.java | 8 +- .../game/net/packet/server/SM_CHAR_INFO.java | 8 +- .../packet/server/SM_CHAR_INFO_BROADCAST.java | 8 +- .../net/packet/server/SM_CHAR_INFO_EXTRA.java | 8 +- .../net/packet/server/SM_CHAR_INVENTORY.java | 8 +- .../game/net/packet/server/SM_CHAR_LIST.java | 8 +- .../net/packet/server/SM_CHAR_OPEN_MAP.java | 8 +- .../net/packet/server/SM_CHAR_RESTART.java | 8 +- .../net/packet/server/SM_CHAR_SELECTED.java | 8 +- .../net/packet/server/SM_CHAR_TEMPLATE.java | 10 +- .../game/net/packet/server/SM_CHAT.java | 8 +- .../net/packet/server/SM_COMMUNITY_HTML.java | 8 +- .../game/net/packet/server/SM_DIE.java | 8 +- .../net/packet/server/SM_ENTER_WORLD.java | 8 +- .../game/net/packet/server/SM_FORT_INFO.java | 8 +- .../game/net/packet/server/SM_GG_QUERY.java | 8 +- .../game/net/packet/server/SM_HTML.java | 8 +- .../net/packet/server/SM_ITEM_GROUND.java | 8 +- .../game/net/packet/server/SM_KEY.java | 8 +- .../game/net/packet/server/SM_MANOR_LIST.java | 8 +- .../game/net/packet/server/SM_MOVE.java | 8 +- .../game/net/packet/server/SM_MOVE_TYPE.java | 8 +- .../game/net/packet/server/SM_NPC_INFO.java | 10 +- .../net/packet/server/SM_OBJECT_REMOVE.java | 8 +- .../net/packet/server/SM_SERVER_OBJECT.java | 10 +- .../net/packet/server/SM_STATUS_UPDATE.java | 8 +- .../game/net/packet/server/SM_STOP.java | 8 +- .../net/packet/server/SM_SYSTEM_MESSAGE.java | 10 +- .../game/net/packet/server/SM_TARGET.java | 8 +- .../game/net/packet/server/SM_TELEPORT.java | 8 +- .../com/l2jserver/model/AbstractModel.java | 8 +- .../main/java/com/l2jserver/model/Model.java | 8 +- .../com/l2jserver/model/dao/CharacterDAO.java | 8 +- .../model/dao/CharacterFriendDAO.java | 8 +- .../l2jserver/model/dao/ChatMessageDAO.java | 8 +- .../java/com/l2jserver/model/dao/ClanDAO.java | 8 +- .../java/com/l2jserver/model/dao/ItemDAO.java | 8 +- .../java/com/l2jserver/model/dao/NPCDAO.java | 8 +- .../java/com/l2jserver/model/dao/PetDAO.java | 8 +- .../java/com/l2jserver/model/game/Castle.java | 8 +- .../l2jserver/model/game/CharacterFriend.java | 8 +- .../java/com/l2jserver/model/game/Fort.java | 8 +- .../com/l2jserver/model/game/Shortcut.java | 8 +- .../java/com/l2jserver/model/game/Skill.java | 8 +- .../l2jserver/model/id/AbstractModelID.java | 8 +- .../com/l2jserver/model/id/AccountID.java | 8 +- .../java/com/l2jserver/model/id/CastleID.java | 8 +- .../com/l2jserver/model/id/ChatMessageID.java | 8 +- .../java/com/l2jserver/model/id/FortID.java | 8 +- .../java/com/l2jserver/model/id/FriendID.java | 8 +- .../main/java/com/l2jserver/model/id/ID.java | 8 +- .../java/com/l2jserver/model/id/ObjectID.java | 8 +- .../com/l2jserver/model/id/ShortcutID.java | 8 +- .../java/com/l2jserver/model/id/SkillID.java | 8 +- .../com/l2jserver/model/id/TemplateID.java | 24 +++- .../model/id/compound/AbstractCompoundID.java | 8 +- .../l2jserver/model/id/object/ActorID.java | 8 +- .../model/id/object/CharacterID.java | 8 +- .../com/l2jserver/model/id/object/ClanID.java | 8 +- .../com/l2jserver/model/id/object/ItemID.java | 8 +- .../com/l2jserver/model/id/object/NPCID.java | 8 +- .../com/l2jserver/model/id/object/PetID.java | 8 +- .../object/allocator/BitSetIDAllocator.java | 8 +- .../id/object/allocator/IDAllocator.java | 8 +- .../allocator/IDAllocatorException.java | 8 +- .../object/iterator/WorldObjectIterable.java | 8 +- .../object/iterator/WorldObjectIterator.java | 8 +- .../object/provider/CharacterIDProvider.java | 8 +- .../id/object/provider/ClanIDProvider.java | 8 +- .../id/object/provider/ItemIDProvider.java | 8 +- .../id/object/provider/NPCIDProvider.java | 8 +- .../id/object/provider/ObjectIDProvider.java | 8 +- .../id/object/provider/ObjectIDResolver.java | 8 +- .../id/object/provider/PetIDProvider.java | 8 +- .../model/id/provider/AccountIDProvider.java | 8 +- .../model/id/provider/CastleIDProvider.java | 8 +- .../id/provider/ChatMessageIDProvider.java | 8 +- .../model/id/provider/CompoundIDProvider.java | 8 +- .../model/id/provider/FortIDProvider.java | 8 +- .../model/id/provider/FriendIDProvider.java | 8 +- .../model/id/provider/IDProvider.java | 8 +- .../model/id/provider/IDProviderModule.java | 8 +- .../model/id/template/ActorTemplateID.java | 10 +- .../id/template/CharacterTemplateID.java | 10 +- .../model/id/template/EffectTemplateID.java | 52 ++++++++ .../model/id/template/ItemTemplateID.java | 10 +- .../model/id/template/NPCTemplateID.java | 10 +- .../model/id/template/SkillTemplateID.java | 8 +- .../id/template/TeleportationTemplateID.java | 10 +- .../provider/CharacterTemplateIDProvider.java | 8 +- .../provider/EffectTemplateIDProvider.java} | 19 ++- .../provider/ItemTemplateIDProvider.java | 8 +- .../provider/NPCTemplateIDProvider.java | 8 +- .../provider/SkillTemplateIDProvider.java | 8 +- .../TeleportationTemplateIDProvider.java | 8 +- .../template/provider/TemplateIDProvider.java | 8 +- .../com/l2jserver/model/server/AttackHit.java | 8 +- .../l2jserver/model/server/ChatMessage.java | 8 +- .../model/server/attack/AttackCalculator.java | 8 +- .../attack/AttackCalculatorContext.java | 8 +- .../attack/AttackCalculatorFunction.java | 8 +- .../attack/PhysicalAttackCalculator.java | 8 +- .../model/template/AbstractTemplate.java | 27 +--- .../model/template/AugmentTemplate.java | 17 ++- .../model/template/EffectTemplate.java | 46 ------- .../model/template/SkillTemplate.java | 30 +++-- .../l2jserver/model/template/Template.java | 20 +-- .../template/{ => actor}/ActorTemplate.java | 20 +-- .../calculator/ItemSetActorCalculator.java | 12 +- .../model/template/capability/Dropable.java | 29 ----- .../template/capability/Enchantable.java | 29 ----- .../template/capability/Interactable.java | 46 ------- .../capability/TemplateCapability.java | 28 ---- .../model/template/capability/Tradable.java | 29 ----- .../template/character/CharacterClass.java | 8 +- .../{ => character}/CharacterTemplate.java | 5 +- .../model/template/effect/EffectTemplate.java | 57 +++++++++ .../effect/TeleportEffectTemplate.java | 75 +++++++++++ .../model/template/item/ArmorType.java | 8 +- .../model/template/item/ItemMaterial.java | 8 +- .../template/{ => item}/ItemTemplate.java | 23 ++-- .../model/template/item/ItemType.java | 8 +- .../l2jserver/model/template/npc/NPCRace.java | 8 +- .../model/template/{ => npc}/NPCTemplate.java | 7 +- .../{ => npc}/TeleportationTemplate.java | 19 ++- .../model/template/skill/SkillEffect.java | 30 ----- .../template/skill/effect/BuffEffect.java | 47 ------- .../template/skill/effect/TeleportEffect.java | 47 ------- .../l2jserver/model/world/AbstractObject.java | 8 +- .../java/com/l2jserver/model/world/Actor.java | 16 +-- .../java/com/l2jserver/model/world/Clan.java | 8 +- .../java/com/l2jserver/model/world/Item.java | 10 +- .../l2jserver/model/world/L2Character.java | 10 +- .../java/com/l2jserver/model/world/NPC.java | 10 +- .../java/com/l2jserver/model/world/Pet.java | 8 +- .../com/l2jserver/model/world/Player.java | 8 +- .../model/world/PositionableObject.java | 8 +- .../l2jserver/model/world/WorldObject.java | 8 +- ...Effects.java => ActorEffectContainer.java} | 34 ++++- .../model/world/actor/ActorExperience.java | 8 +- .../world/actor/ActorSkillContainer.java | 8 +- .../actor/calculator/ActorCalculator.java | 8 +- .../calculator/ActorCalculatorContext.java | 8 +- .../calculator/ActorCalculatorFunction.java | 10 +- .../world/actor/calculator/ActorFormula.java | 8 +- .../AttackAccuracyBonusCalculator.java | 10 +- .../AttackEvasionBonusCalculator.java | 10 +- .../MagicalAttackBonusCalculator.java | 10 +- .../MagicalAttackSpeedBonusCalculator.java | 10 +- .../MagicalCriticalRateBonusCalculator.java | 2 +- .../MagicalDefenseBonusCalculator.java | 10 +- .../calculator/MaximumHPBonusCalculator.java | 10 +- .../calculator/MaximumMPBonusCalculator.java | 10 +- .../PhysicalAttackBonusCalculator.java | 10 +- .../PhysicalAttackSpeedBonusCalculator.java | 10 +- .../PhysicalCriticalRateBonusCalculator.java | 10 +- .../PhysicalDefenseBonusCalculator.java | 10 +- .../calculator/RunSpeedBonusCalculator.java | 10 +- .../calculator/WalkSpeedBonusCalculator.java | 10 +- .../world/actor/effect/AbstractEffect.java | 61 +++++++++ .../actor/effect/AbstractTemporalEffect.java | 75 +++++++++++ .../model/world/actor/effect/Effect.java | 59 +++++++++ .../world/actor/effect/TemporalEffect.java | 47 +++++++ .../actor/event/ActorAttackHitEvent.java | 8 +- .../world/actor/event/ActorDieEvent.java | 8 +- .../model/world/actor/event/ActorEvent.java | 8 +- .../world/actor/event/ActorListener.java | 8 +- .../world/actor/event/ActorSpawnEvent.java | 8 +- .../event/ActorTeleportingEvent.java} | 39 +++--- .../world/actor/event/ActorUnspawnEvent.java | 8 +- .../model/world/actor/stat/ActorStats.java | 8 +- .../model/world/actor/stat/BaseStats.java | 8 +- .../world/character/CharacterAppearance.java | 8 +- .../world/character/CharacterFriendList.java | 8 +- .../world/character/CharacterInventory.java | 8 +- .../character/CharacterShortcutContainer.java | 8 +- .../model/world/character/CharacterStats.java | 10 +- .../calculator/CharacterCalculator.java | 8 +- .../CharacterCalculatorContext.java | 8 +- .../CharacterCalculatorFunction.java | 12 +- .../calculator/CharacterFormula.java | 8 +- .../calculator/MaximumCPAddCalculator.java | 10 +- .../calculator/MaximumCPBonusCalculator.java | 10 +- .../calculator/MaximumHPAddCalculator.java | 10 +- .../calculator/MaximumMPAddCalculator.java | 10 +- ...CharacterBaseAttackAccuracyCalculator.java | 10 +- .../CharacterBaseAttackEvasionCalculator.java | 10 +- .../base/CharacterBaseCPCalculator.java | 10 +- .../CharacterBaseConcentrationCalculator.java | 10 +- .../CharacterBaseDexterityCalculator.java | 10 +- .../base/CharacterBaseHPCalculator.java | 10 +- .../CharacterBaseIntelligenceCalculator.java | 10 +- .../base/CharacterBaseMPCalculator.java | 10 +- .../CharacterBaseMagicalAttackCalculator.java | 10 +- ...acterBaseMagicalAttackSpeedCalculator.java | 10 +- ...cterBaseMagicalCriticalRateCalculator.java | 10 +- ...CharacterBaseMagicalDefenseCalculator.java | 10 +- .../CharacterBaseMentalityCalculator.java | 10 +- ...CharacterBasePhysicalAttackCalculator.java | 10 +- ...cterBasePhysicalAttackSpeedCalculator.java | 10 +- ...terBasePhysicalCriticalRateCalculator.java | 10 +- ...haracterBasePhysicalDefenseCalculator.java | 10 +- .../base/CharacterBaseRunSpeedCalculator.java | 10 +- .../base/CharacterBaseStrengthCalculator.java | 10 +- .../CharacterBaseWalkSpeedCalculator.java | 10 +- .../base/CharacterBaseWitnessCalculator.java | 10 +- .../character/event/CharacterAttackEvent.java | 8 +- .../event/CharacterEnterWorldEvent.java | 8 +- .../world/character/event/CharacterEvent.java | 8 +- .../event/CharacterLeaveWorldEvent.java | 8 +- .../character/event/CharacterListener.java | 8 +- .../character/event/CharacterMoveEvent.java | 8 +- .../event/CharacterRunningEvent.java | 8 +- .../event/CharacterStopMoveEvent.java | 8 +- .../event/CharacterTargetDeselectedEvent.java | 8 +- .../event/CharacterTargetSelectedEvent.java | 8 +- .../event/CharacterWalkingEvent.java | 8 +- .../l2jserver/model/world/clan/ClanEvent.java | 8 +- .../model/world/clan/ClanListener.java | 8 +- .../model/world/clan/ClanMembers.java | 8 +- .../model/world/event/SpawnEvent.java | 8 +- .../model/world/event/UnspawnEvent.java | 8 +- .../model/world/item/ItemDropEvent.java | 8 +- .../l2jserver/model/world/item/ItemEvent.java | 8 +- .../model/world/item/ItemListener.java | 8 +- .../l2jserver/model/world/npc/NPCStats.java | 8 +- .../world/npc/calculator/NPCCalculator.java | 8 +- .../npc/calculator/NPCCalculatorContext.java | 8 +- .../npc/calculator/NPCCalculatorFunction.java | 12 +- .../world/npc/calculator/NPCFormula.java | 8 +- .../base/NPCBaseAttackEvasionCalculator.java | 10 +- .../base/NPCBaseConcentrationCalculator.java | 10 +- .../base/NPCBaseDexterityCalculator.java | 10 +- .../calculator/base/NPCBaseHPCalculator.java | 10 +- .../base/NPCBaseIntelligenceCalculator.java | 10 +- .../calculator/base/NPCBaseMPCalculator.java | 10 +- .../base/NPCBaseMagicalAttackCalculator.java | 10 +- .../NPCBaseMagicalAttackSpeedCalculator.java | 10 +- .../NPCBaseMagicalCriticalRateCalculator.java | 10 +- .../base/NPCBaseMagicalDefenseCalculator.java | 10 +- .../base/NPCBaseMentalityCalculator.java | 10 +- .../base/NPCBasePhysicalAttackCalculator.java | 10 +- .../NPCBasePhysicalAttackSpeedCalculator.java | 10 +- ...NPCBasePhysicalCriticalRateCalculator.java | 10 +- .../NPCBasePhysicalDefenseCalculator.java | 10 +- .../base/NPCBaseRunSpeedCalculator.java | 10 +- .../base/NPCBaseStrengthCalculator.java | 10 +- .../base/NPCBaseWalkSpeedCalculator.java | 10 +- .../base/NPCBaseWitnessCalculator.java | 10 +- .../npc/controller/BaseNPCController.java | 10 +- .../npc/controller/MonsterController.java | 8 +- .../world/npc/controller/NPCController.java | 8 +- .../NotImplementedNPCController.java | 8 +- .../npc/controller/TeleporterController.java | 10 +- .../model/world/npc/event/NPCDieEvent.java | 8 +- .../model/world/npc/event/NPCEvent.java | 8 +- .../model/world/npc/event/NPCListener.java | 8 +- .../model/world/npc/event/NPCSpawnEvent.java | 8 +- .../world/npc/event/NPCUnspawnEvent.java | 8 +- .../model/world/player/event/PlayerEvent.java | 8 +- .../world/player/event/PlayerListener.java | 8 +- .../world/player/event/PlayerSpawnEvent.java | 8 +- .../player/event/PlayerTeleportedEvent.java | 8 +- .../com/l2jserver/service/ServiceModule.java | 8 +- .../service/database/DerbyDAOModule.java | 8 +- .../database/GameServerDAOResolver.java | 8 +- .../GameServerJDBCDatabaseService.java | 8 +- .../GameServerOrientDatabaseService.java | 8 +- .../service/database/H2DAOModule.java | 8 +- .../service/database/MySQL5DAOModule.java | 8 +- .../service/database/OrientDBDAOModule.java | 8 +- .../database/jdbc/JDBCCharacterDAO.java | 10 +- .../database/jdbc/JDBCCharacterFriendDAO.java | 8 +- .../database/jdbc/JDBCChatMessageDAO.java | 8 +- .../service/database/jdbc/JDBCClanDAO.java | 8 +- .../service/database/jdbc/JDBCItemDAO.java | 10 +- .../service/database/jdbc/JDBCNPCDAO.java | 10 +- .../jdbc/derby/DerbyCharacterDAO.java | 8 +- .../jdbc/derby/DerbyCharacterFriendDAO.java | 8 +- .../jdbc/derby/DerbyChatMessageDAO.java | 8 +- .../database/jdbc/derby/DerbyClanDAO.java | 8 +- .../database/jdbc/derby/DerbyItemDAO.java | 8 +- .../database/jdbc/derby/DerbyNPCDAO.java | 8 +- .../database/jdbc/h2/H2CharacterDAO.java | 8 +- .../jdbc/h2/H2CharacterFriendDAO.java | 8 +- .../database/jdbc/h2/H2ChatMessageDAO.java | 8 +- .../service/database/jdbc/h2/H2ClanDAO.java | 8 +- .../service/database/jdbc/h2/H2ItemDAO.java | 8 +- .../service/database/jdbc/h2/H2NPCDAO.java | 8 +- .../jdbc/mysql5/MySQL5CharacterDAO.java | 8 +- .../jdbc/mysql5/MySQL5CharacterFriendDAO.java | 8 +- .../jdbc/mysql5/MySQL5ChatMessageDAO.java | 8 +- .../database/jdbc/mysql5/MySQL5ClanDAO.java | 8 +- .../database/jdbc/mysql5/MySQL5ItemDAO.java | 8 +- .../database/jdbc/mysql5/MySQL5NPCDAO.java | 8 +- .../orientdb/OrientDBCharacterDAO.java | 10 +- .../orientdb/OrientDBCharacterFriendDAO.java | 8 +- .../orientdb/OrientDBChatMessageDAO.java | 8 +- .../l2jserver/service/game/AttackService.java | 8 +- .../service/game/AttackServiceImpl.java | 8 +- .../l2jserver/service/game/DuelService.java | 8 +- .../service/game/DuelServiceImpl.java | 8 +- .../service/game/GameTimeService.java | 8 +- .../service/game/GameTimeServiceImpl.java | 8 +- .../service/game/LotteryService.java | 8 +- .../com/l2jserver/service/game/PKService.java | 8 +- .../l2jserver/service/game/PvPService.java | 8 +- .../game/admin/AdministratorService.java | 8 +- .../game/admin/AdministratorServiceImpl.java | 8 +- .../service/game/admin/GMService.java | 8 +- .../game/admin/panel/AdminHomeTemplate.java | 8 +- .../game/admin/panel/TeleportTemplate.java | 8 +- .../l2jserver/service/game/ai/AIScript.java | 8 +- .../l2jserver/service/game/ai/AIService.java | 8 +- .../service/game/ai/AIServiceImpl.java | 8 +- .../service/game/castle/CastleService.java | 8 +- .../service/game/castle/SiegeService.java | 8 +- .../ActorIsNotAttackableServiceException.java | 8 +- .../CannotSetTargetServiceException.java | 8 +- ...aracterAlreadyRunningServiceException.java | 8 +- ...aracterAlreadyWalkingServiceException.java | 8 +- .../CharacterInJailServiceException.java | 8 +- .../CharacterInvalidAppearanceException.java | 8 +- .../CharacterInvalidNameException.java | 8 +- .../CharacterNameAlreadyExistsException.java | 8 +- .../CharacterNotInJailServiceException.java | 8 +- .../game/character/CharacterService.java | 8 +- .../character/CharacterServiceException.java | 8 +- .../game/character/CharacterServiceImpl.java | 10 +- .../CannotChatToSelfChatServiceException.java | 8 +- .../ChatBanActiveChatServiceException.java | 8 +- .../service/game/chat/ChatChannel.java | 8 +- .../service/game/chat/ChatChannelFilter.java | 8 +- .../game/chat/ChatChannelListener.java | 8 +- .../service/game/chat/ChatLoggingService.java | 8 +- .../service/game/chat/ChatMessageType.java | 8 +- .../service/game/chat/ChatService.java | 8 +- .../game/chat/ChatServiceException.java | 8 +- .../ChatTargetOfflineServiceException.java | 8 +- .../game/chat/DatabaseChatLoggingService.java | 8 +- .../service/game/chat/PrivateChatChannel.java | 8 +- .../service/game/chat/PublicChatChannel.java | 8 +- .../service/game/chat/SimpleChatService.java | 8 +- .../TargetNotFoundChatServiceException.java | 8 +- .../service/game/clan/ClanService.java | 8 +- .../service/game/clan/FortService.java | 8 +- .../service/game/effect/EffectService.java | 47 +++++-- .../game/effect/SimpleEffectService.java | 120 ++++++++++++++++++ .../service/game/map/GeoDataMapService.java | 8 +- .../service/game/map/MapService.java | 8 +- .../com/l2jserver/service/game/map/Tile.java | 8 +- .../game/map/pathing/AStarPathingService.java | 8 +- .../game/map/pathing/AbstractPath.java | 8 +- .../map/pathing/MapperPathingService.java | 8 +- .../service/game/map/pathing/Path.java | 8 +- .../game/map/pathing/PathingService.java | 8 +- .../game/npc/ActionServiceException.java | 8 +- .../service/game/npc/NPCService.java | 10 +- .../service/game/npc/NPCServiceException.java | 8 +- .../service/game/npc/NPCServiceImpl.java | 10 +- .../npc/NotAttackableNPCServiceException.java | 8 +- .../l2jserver/service/game/region/Region.java | 8 +- .../service/game/region/RegionService.java | 8 +- .../game/scripting/CompilationResult.java | 8 +- .../game/scripting/ScriptCompiler.java | 8 +- .../game/scripting/ScriptingService.java | 8 +- .../game/scripting/ScriptingServiceImpl.java | 8 +- .../classlistener/ClassListener.java | 8 +- .../game/scripting/classlistener/Loader.java | 8 +- .../scripting/classlistener/Unloader.java | 8 +- .../spawn/AlreadySpawnedServiceException.java | 8 +- ...terAlreadyTeleportingServiceException.java | 8 +- ...aracterNotTeleportingServiceException.java | 8 +- .../spawn/NotSpawnedServiceException.java | 8 +- .../SpawnPointNotFoundServiceException.java | 8 +- .../service/game/spawn/SpawnService.java | 23 ++-- .../game/spawn/SpawnServiceException.java | 8 +- .../service/game/spawn/SpawnServiceImpl.java | 31 +++-- .../game/template/TemplateService.java | 10 +- .../game/template/XMLTemplateService.java | 51 ++++---- .../game/world/CachedWorldIDService.java | 8 +- .../service/game/world/WorldIDService.java | 8 +- .../service/game/world/WorldService.java | 8 +- .../service/game/world/WorldServiceImpl.java | 8 +- .../world/event/FilteredWorldListener.java | 8 +- .../game/world/event/TypedWorldListener.java | 8 +- .../service/game/world/event/WorldEvent.java | 8 +- .../world/event/WorldEventDispatcher.java | 8 +- .../world/event/WorldEventDispatcherImpl.java | 8 +- .../game/world/event/WorldEventFuture.java | 8 +- .../game/world/event/WorldListener.java | 8 +- .../service/game/world/filter/AndFilter.java | 8 +- .../game/world/filter/ExcludeFilter.java | 8 +- .../game/world/filter/FilterIterator.java | 8 +- .../service/game/world/filter/NotFilter.java | 8 +- .../service/game/world/filter/OrFilter.java | 8 +- .../game/world/filter/WorldFilters.java | 8 +- .../game/world/filter/WorldObjectFilter.java | 8 +- .../filter/impl/CharacterBroadcastFilter.java | 8 +- .../game/world/filter/impl/IDFilter.java | 8 +- .../world/filter/impl/InstanceFilter.java | 8 +- .../world/filter/impl/KnownListFilter.java | 8 +- .../filter/impl/KnownListUpdateFilter.java | 8 +- .../game/world/filter/impl/RangeFilter.java | 8 +- .../world/filter/impl/RangePointFilter.java | 8 +- .../service/network/NettyNetworkService.java | 8 +- .../service/network/NetworkService.java | 8 +- .../network/broadcast/BroadcastService.java | 8 +- .../broadcast/BroadcastServiceImpl.java | 12 +- .../network/gameguard/GameGuardService.java | 8 +- .../gameguard/GameGuardServiceImpl.java | 8 +- .../network/keygen/BlowfishKeygenService.java | 8 +- .../PseudoRandomBlowfishKeygenService.java | 8 +- .../keygen/SecureBlowfishKeygenService.java | 8 +- .../calculator/AbstractDoubleFunction.java | 8 +- .../l2jserver/util/calculator/Calculator.java | 8 +- .../util/calculator/CalculatorContext.java | 8 +- .../util/calculator/ComplexCalculator.java | 8 +- .../l2jserver/util/calculator/Function.java | 8 +- .../util/calculator/SimpleCalculator.java | 8 +- .../com/l2jserver/util/html/L2BodyTag.java | 8 +- .../java/com/l2jserver/util/html/L2BrTag.java | 8 +- .../com/l2jserver/util/html/L2CenterTag.java | 8 +- .../com/l2jserver/util/html/L2DivTag.java | 8 +- .../com/l2jserver/util/html/L2FontTag.java | 8 +- .../com/l2jserver/util/html/L2HeadTag.java | 8 +- .../com/l2jserver/util/html/L2HtmlTag.java | 8 +- .../com/l2jserver/util/html/L2ImageTag.java | 8 +- .../com/l2jserver/util/html/L2LinkTag.java | 8 +- .../com/l2jserver/util/html/L2NewLineTag.java | 8 +- .../com/l2jserver/util/html/L2TitleTag.java | 8 +- .../util/html/markup/HtmlTemplate.java | 8 +- .../l2jserver/util/html/markup/MarkupTag.java | 8 +- .../util/jaxb/CharacterTemplateIDAdapter.java | 8 +- .../util/jaxb/CoordinateAdapter.java | 8 +- .../util/jaxb/EffectTemplateIDAdapter.java | 69 ++++++++++ .../util/jaxb/ItemTemplateIDAdapter.java | 8 +- .../com/l2jserver/util/jaxb/MapAdapter.java | 8 +- .../util/jaxb/NPCTemplateIDAdapter.java | 8 +- .../util/jaxb/SkillTemplateIDAdapter.java | 8 +- .../jaxb/TeleportationTemplateIDAdapter.java | 8 +- .../db/dao/mysql5/MySQL5CharacterDAOTest.java | 8 +- .../id/provider/CharacterIDProviderTest.java | 8 +- .../scripting/ScriptingServiceImplTest.java | 8 +- .../template/StaticTemplateServiceTest.java | 8 +- .../world/WorldEventDispatcherImplTest.java | 8 +- .../service/world/WorldServiceImplTest.java | 8 +- .../util/calculator/CalculatorTest.java | 8 +- .../service/database/H2DAOModule.java | 8 +- .../LoginServerJDBCDatabaseService.java | 8 +- .../service/database/MySQL5DAOModule.java | 8 +- .../gameserver/GameServerNetworkService.java | 8 +- .../template/SkillTemplateConverter.java | 8 +- .../CharacterTemplateConverter.java | 31 ++--- .../{ => npc}/NPCTemplateConverter.java | 49 +++---- .../tool/CharacterSQLEnumGenerator.java | 8 +- .../com/l2jserver/tool/EndianessTest.java | 8 +- .../conversor/itemtemplate/ItemListXml.java | 8 +- .../conversor/itemtemplate/ItemSetXml.java | 8 +- .../itemtemplate/ItemTemplateConversor.java | 8 +- .../conversor/itemtemplate/ItemValueXml.java | 8 +- .../tool/conversor/itemtemplate/ItemXml.java | 8 +- .../tool/xml/TemplateSchemaGeneratorMain.java | 6 +- 591 files changed, 3203 insertions(+), 2873 deletions(-) create mode 100644 l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/EffectTemplateID.java rename l2jserver2-gameserver/src/main/java/com/l2jserver/model/{template/capability/Sellable.java => id/template/provider/EffectTemplateIDProvider.java} (50%) delete mode 100644 l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/EffectTemplate.java rename l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/{ => actor}/ActorTemplate.java (69%) delete mode 100644 l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/capability/Dropable.java delete mode 100644 l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/capability/Enchantable.java delete mode 100644 l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/capability/Interactable.java delete mode 100644 l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/capability/TemplateCapability.java delete mode 100644 l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/capability/Tradable.java rename l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/{ => character}/CharacterTemplate.java (98%) create mode 100644 l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/effect/EffectTemplate.java create mode 100644 l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/effect/TeleportEffectTemplate.java rename l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/{ => item}/ItemTemplate.java (90%) rename l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/{ => npc}/NPCTemplate.java (98%) rename l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/{ => npc}/TeleportationTemplate.java (85%) delete mode 100644 l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/skill/SkillEffect.java delete mode 100644 l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/skill/effect/BuffEffect.java delete mode 100644 l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/skill/effect/TeleportEffect.java rename l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/{ActorEffects.java => ActorEffectContainer.java} (52%) create mode 100644 l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/effect/AbstractEffect.java create mode 100644 l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/effect/AbstractTemporalEffect.java create mode 100644 l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/effect/Effect.java create mode 100644 l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/effect/TemporalEffect.java rename l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/{player/event/PlayerTeleportingEvent.java => actor/event/ActorTeleportingEvent.java} (58%) create mode 100644 l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/effect/SimpleEffectService.java create mode 100644 l2jserver2-gameserver/src/main/java/com/l2jserver/util/jaxb/EffectTemplateIDAdapter.java rename l2jserver2-tools/src/main/java/com/l2jserver/model/template/{ => character}/CharacterTemplateConverter.java (80%) rename l2jserver2-tools/src/main/java/com/l2jserver/model/template/{ => npc}/NPCTemplateConverter.java (88%) diff --git a/l2jserver2-common/src/main/java/com/l2jserver/model/AbstractModel.java b/l2jserver2-common/src/main/java/com/l2jserver/model/AbstractModel.java index 8a01afcdd..401e87266 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/model/AbstractModel.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/model/AbstractModel.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model; diff --git a/l2jserver2-common/src/main/java/com/l2jserver/model/Model.java b/l2jserver2-common/src/main/java/com/l2jserver/model/Model.java index 3a6a42399..62fb20ee9 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/model/Model.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/model/Model.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model; diff --git a/l2jserver2-common/src/main/java/com/l2jserver/model/id/AbstractModelID.java b/l2jserver2-common/src/main/java/com/l2jserver/model/id/AbstractModelID.java index c7100b8a6..764f29807 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/model/id/AbstractModelID.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/model/id/AbstractModelID.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.id; diff --git a/l2jserver2-common/src/main/java/com/l2jserver/model/id/ID.java b/l2jserver2-common/src/main/java/com/l2jserver/model/id/ID.java index 35d5c673c..b9ecf2a92 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/model/id/ID.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/model/id/ID.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.id; diff --git a/l2jserver2-common/src/main/java/com/l2jserver/model/id/compound/AbstractCompoundID.java b/l2jserver2-common/src/main/java/com/l2jserver/model/id/compound/AbstractCompoundID.java index 72e51fa72..5cd65b9df 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/model/id/compound/AbstractCompoundID.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/model/id/compound/AbstractCompoundID.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.id.compound; diff --git a/l2jserver2-common/src/main/java/com/l2jserver/model/id/object/allocator/BitSetIDAllocator.java b/l2jserver2-common/src/main/java/com/l2jserver/model/id/object/allocator/BitSetIDAllocator.java index 4c50e0dad..ed65a0d16 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/model/id/object/allocator/BitSetIDAllocator.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/model/id/object/allocator/BitSetIDAllocator.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.id.object.allocator; diff --git a/l2jserver2-common/src/main/java/com/l2jserver/model/id/object/allocator/IDAllocator.java b/l2jserver2-common/src/main/java/com/l2jserver/model/id/object/allocator/IDAllocator.java index 1854e9ab8..dade608ca 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/model/id/object/allocator/IDAllocator.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/model/id/object/allocator/IDAllocator.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.id.object.allocator; diff --git a/l2jserver2-common/src/main/java/com/l2jserver/model/id/object/allocator/IDAllocatorException.java b/l2jserver2-common/src/main/java/com/l2jserver/model/id/object/allocator/IDAllocatorException.java index d3b85fee8..dfef4cfe3 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/model/id/object/allocator/IDAllocatorException.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/model/id/object/allocator/IDAllocatorException.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.id.object.allocator; diff --git a/l2jserver2-common/src/main/java/com/l2jserver/model/id/provider/CompoundIDProvider.java b/l2jserver2-common/src/main/java/com/l2jserver/model/id/provider/CompoundIDProvider.java index b02216822..472074cd7 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/model/id/provider/CompoundIDProvider.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/model/id/provider/CompoundIDProvider.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.id.provider; diff --git a/l2jserver2-common/src/main/java/com/l2jserver/model/id/provider/IDProvider.java b/l2jserver2-common/src/main/java/com/l2jserver/model/id/provider/IDProvider.java index e7c1abdf8..34e051e08 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/model/id/provider/IDProvider.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/model/id/provider/IDProvider.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.id.provider; diff --git a/l2jserver2-common/src/main/java/com/l2jserver/service/AbstractService.java b/l2jserver2-common/src/main/java/com/l2jserver/service/AbstractService.java index 84c2b0799..138068e57 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/service/AbstractService.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/service/AbstractService.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service; diff --git a/l2jserver2-common/src/main/java/com/l2jserver/service/Service.java b/l2jserver2-common/src/main/java/com/l2jserver/service/Service.java index f76047b53..2a5c0c88b 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/service/Service.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/service/Service.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service; diff --git a/l2jserver2-common/src/main/java/com/l2jserver/service/ServiceConfiguration.java b/l2jserver2-common/src/main/java/com/l2jserver/service/ServiceConfiguration.java index 1e8bdd154..26f62bafb 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/service/ServiceConfiguration.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/service/ServiceConfiguration.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service; diff --git a/l2jserver2-common/src/main/java/com/l2jserver/service/ServiceException.java b/l2jserver2-common/src/main/java/com/l2jserver/service/ServiceException.java index 37f5bad39..7dc8f3aa7 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/service/ServiceException.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/service/ServiceException.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service; diff --git a/l2jserver2-common/src/main/java/com/l2jserver/service/ServiceManager.java b/l2jserver2-common/src/main/java/com/l2jserver/service/ServiceManager.java index ceb8964bf..08d5796f8 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/service/ServiceManager.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/service/ServiceManager.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service; diff --git a/l2jserver2-common/src/main/java/com/l2jserver/service/ServiceRestartException.java b/l2jserver2-common/src/main/java/com/l2jserver/service/ServiceRestartException.java index 986dceb7a..c7603bcd5 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/service/ServiceRestartException.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/service/ServiceRestartException.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service; diff --git a/l2jserver2-common/src/main/java/com/l2jserver/service/ServiceStartException.java b/l2jserver2-common/src/main/java/com/l2jserver/service/ServiceStartException.java index 15be54222..1c4b59120 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/service/ServiceStartException.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/service/ServiceStartException.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service; diff --git a/l2jserver2-common/src/main/java/com/l2jserver/service/ServiceStopException.java b/l2jserver2-common/src/main/java/com/l2jserver/service/ServiceStopException.java index 408de3f96..ed1f0bd62 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/service/ServiceStopException.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/service/ServiceStopException.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service; diff --git a/l2jserver2-common/src/main/java/com/l2jserver/service/cache/CacheService.java b/l2jserver2-common/src/main/java/com/l2jserver/service/cache/CacheService.java index 93365e313..3cb9d9f33 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/service/cache/CacheService.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/service/cache/CacheService.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.cache; diff --git a/l2jserver2-common/src/main/java/com/l2jserver/service/cache/Cacheable.java b/l2jserver2-common/src/main/java/com/l2jserver/service/cache/Cacheable.java index 2aa1e68a3..ce193d3cc 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/service/cache/Cacheable.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/service/cache/Cacheable.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.cache; diff --git a/l2jserver2-common/src/main/java/com/l2jserver/service/cache/EhCacheService.java b/l2jserver2-common/src/main/java/com/l2jserver/service/cache/EhCacheService.java index c6dafe10e..67f0e7c2e 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/service/cache/EhCacheService.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/service/cache/EhCacheService.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.cache; diff --git a/l2jserver2-common/src/main/java/com/l2jserver/service/cache/IgnoreCaching.java b/l2jserver2-common/src/main/java/com/l2jserver/service/cache/IgnoreCaching.java index 7b8bdeb76..000b4a32b 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/service/cache/IgnoreCaching.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/service/cache/IgnoreCaching.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.cache; diff --git a/l2jserver2-common/src/main/java/com/l2jserver/service/cache/MethodInvocation.java b/l2jserver2-common/src/main/java/com/l2jserver/service/cache/MethodInvocation.java index 0244be805..acbe0187d 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/service/cache/MethodInvocation.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/service/cache/MethodInvocation.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.cache; diff --git a/l2jserver2-common/src/main/java/com/l2jserver/service/cache/SoftCacheService.java b/l2jserver2-common/src/main/java/com/l2jserver/service/cache/SoftCacheService.java index b665650b4..4dc73c75b 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/service/cache/SoftCacheService.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/service/cache/SoftCacheService.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.cache; diff --git a/l2jserver2-common/src/main/java/com/l2jserver/service/cache/WeakCacheService.java b/l2jserver2-common/src/main/java/com/l2jserver/service/cache/WeakCacheService.java index 75e0b5f5c..85d3f85d0 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/service/cache/WeakCacheService.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/service/cache/WeakCacheService.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.cache; diff --git a/l2jserver2-common/src/main/java/com/l2jserver/service/configuration/Configuration.java b/l2jserver2-common/src/main/java/com/l2jserver/service/configuration/Configuration.java index d651f3911..df40bf477 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/service/configuration/Configuration.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/service/configuration/Configuration.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.configuration; diff --git a/l2jserver2-common/src/main/java/com/l2jserver/service/configuration/ConfigurationService.java b/l2jserver2-common/src/main/java/com/l2jserver/service/configuration/ConfigurationService.java index a922012b2..a6836eb27 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/service/configuration/ConfigurationService.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/service/configuration/ConfigurationService.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.configuration; diff --git a/l2jserver2-common/src/main/java/com/l2jserver/service/configuration/ProxyConfigurationService.java b/l2jserver2-common/src/main/java/com/l2jserver/service/configuration/ProxyConfigurationService.java index 417ffc692..bff4d1efd 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/service/configuration/ProxyConfigurationService.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/service/configuration/ProxyConfigurationService.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.configuration; diff --git a/l2jserver2-common/src/main/java/com/l2jserver/service/configuration/XMLConfigurationService.java b/l2jserver2-common/src/main/java/com/l2jserver/service/configuration/XMLConfigurationService.java index 75027aa8b..eda6480e4 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/service/configuration/XMLConfigurationService.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/service/configuration/XMLConfigurationService.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.configuration; diff --git a/l2jserver2-common/src/main/java/com/l2jserver/service/core/ExceptionService.java b/l2jserver2-common/src/main/java/com/l2jserver/service/core/ExceptionService.java index 19784dbe2..17b6a4f60 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/service/core/ExceptionService.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/service/core/ExceptionService.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.core; diff --git a/l2jserver2-common/src/main/java/com/l2jserver/service/core/Log4JLoggingService.java b/l2jserver2-common/src/main/java/com/l2jserver/service/core/Log4JLoggingService.java index d6b589839..b94b1a557 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/service/core/Log4JLoggingService.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/service/core/Log4JLoggingService.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.core; diff --git a/l2jserver2-common/src/main/java/com/l2jserver/service/core/LoggingService.java b/l2jserver2-common/src/main/java/com/l2jserver/service/core/LoggingService.java index 809fd3fd3..35ab12baa 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/service/core/LoggingService.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/service/core/LoggingService.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.core; diff --git a/l2jserver2-common/src/main/java/com/l2jserver/service/core/threading/AsyncFuture.java b/l2jserver2-common/src/main/java/com/l2jserver/service/core/threading/AsyncFuture.java index 11a323f65..4ce629b15 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/service/core/threading/AsyncFuture.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/service/core/threading/AsyncFuture.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.core.threading; diff --git a/l2jserver2-common/src/main/java/com/l2jserver/service/core/threading/ScheduledAsyncFuture.java b/l2jserver2-common/src/main/java/com/l2jserver/service/core/threading/ScheduledAsyncFuture.java index cc864c866..a4cae3587 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/service/core/threading/ScheduledAsyncFuture.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/service/core/threading/ScheduledAsyncFuture.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.core.threading; diff --git a/l2jserver2-common/src/main/java/com/l2jserver/service/core/threading/ThreadPool.java b/l2jserver2-common/src/main/java/com/l2jserver/service/core/threading/ThreadPool.java index 0224b080b..350fa4b2c 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/service/core/threading/ThreadPool.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/service/core/threading/ThreadPool.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.core.threading; diff --git a/l2jserver2-common/src/main/java/com/l2jserver/service/core/threading/ThreadService.java b/l2jserver2-common/src/main/java/com/l2jserver/service/core/threading/ThreadService.java index c013395df..f1f6fd82d 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/service/core/threading/ThreadService.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/service/core/threading/ThreadService.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.core.threading; diff --git a/l2jserver2-common/src/main/java/com/l2jserver/service/core/threading/ThreadServiceImpl.java b/l2jserver2-common/src/main/java/com/l2jserver/service/core/threading/ThreadServiceImpl.java index bb17c3358..67b99c56f 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/service/core/threading/ThreadServiceImpl.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/service/core/threading/ThreadServiceImpl.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.core.threading; diff --git a/l2jserver2-common/src/main/java/com/l2jserver/service/core/vfs/Java7VFSService.java b/l2jserver2-common/src/main/java/com/l2jserver/service/core/vfs/Java7VFSService.java index 76036302a..e30d6df3e 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/service/core/vfs/Java7VFSService.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/service/core/vfs/Java7VFSService.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.core.vfs; diff --git a/l2jserver2-common/src/main/java/com/l2jserver/service/core/vfs/VFSService.java b/l2jserver2-common/src/main/java/com/l2jserver/service/core/vfs/VFSService.java index fedcf162b..1ead356c4 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/service/core/vfs/VFSService.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/service/core/vfs/VFSService.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.core.vfs; diff --git a/l2jserver2-common/src/main/java/com/l2jserver/service/database/AbstractDAO.java b/l2jserver2-common/src/main/java/com/l2jserver/service/database/AbstractDAO.java index 26d13225f..1c5469c3d 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/service/database/AbstractDAO.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/service/database/AbstractDAO.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.database; diff --git a/l2jserver2-common/src/main/java/com/l2jserver/service/database/AbstractJDBCDatabaseService.java b/l2jserver2-common/src/main/java/com/l2jserver/service/database/AbstractJDBCDatabaseService.java index 25baace41..fab05a5b1 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/service/database/AbstractJDBCDatabaseService.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/service/database/AbstractJDBCDatabaseService.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.database; diff --git a/l2jserver2-common/src/main/java/com/l2jserver/service/database/AbstractOrientDatabaseService.java b/l2jserver2-common/src/main/java/com/l2jserver/service/database/AbstractOrientDatabaseService.java index 20492682e..673cd5bba 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/service/database/AbstractOrientDatabaseService.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/service/database/AbstractOrientDatabaseService.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.database; diff --git a/l2jserver2-common/src/main/java/com/l2jserver/service/database/DataAccessObject.java b/l2jserver2-common/src/main/java/com/l2jserver/service/database/DataAccessObject.java index 3b47ddeab..eba533b0b 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/service/database/DataAccessObject.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/service/database/DataAccessObject.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.database; diff --git a/l2jserver2-common/src/main/java/com/l2jserver/service/database/DatabaseService.java b/l2jserver2-common/src/main/java/com/l2jserver/service/database/DatabaseService.java index 492052884..685c2c88a 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/service/database/DatabaseService.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/service/database/DatabaseService.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.database; diff --git a/l2jserver2-common/src/main/java/com/l2jserver/service/database/jdbc/AbstractJDBCDAO.java b/l2jserver2-common/src/main/java/com/l2jserver/service/database/jdbc/AbstractJDBCDAO.java index efc6e534f..dc92dab77 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/service/database/jdbc/AbstractJDBCDAO.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/service/database/jdbc/AbstractJDBCDAO.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.database.jdbc; diff --git a/l2jserver2-common/src/main/java/com/l2jserver/service/database/orientdb/AbstractOrientDBDAO.java b/l2jserver2-common/src/main/java/com/l2jserver/service/database/orientdb/AbstractOrientDBDAO.java index c0d398d9e..199cac91a 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/service/database/orientdb/AbstractOrientDBDAO.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/service/database/orientdb/AbstractOrientDBDAO.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.database.orientdb; diff --git a/l2jserver2-common/src/main/java/com/l2jserver/util/ArrayIterator.java b/l2jserver2-common/src/main/java/com/l2jserver/util/ArrayIterator.java index 5d9f4e66d..2b98fb098 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/util/ArrayIterator.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/util/ArrayIterator.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.util; diff --git a/l2jserver2-common/src/main/java/com/l2jserver/util/BufferUtils.java b/l2jserver2-common/src/main/java/com/l2jserver/util/BufferUtils.java index 6ed907d23..65ec4a587 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/util/BufferUtils.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/util/BufferUtils.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.util; diff --git a/l2jserver2-common/src/main/java/com/l2jserver/util/RGBColor.java b/l2jserver2-common/src/main/java/com/l2jserver/util/RGBColor.java index 5e8bb0a8b..4f75b90cb 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/util/RGBColor.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/util/RGBColor.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.util; diff --git a/l2jserver2-common/src/main/java/com/l2jserver/util/exception/L2Exception.java b/l2jserver2-common/src/main/java/com/l2jserver/util/exception/L2Exception.java index f1d8e6b02..4882c61c7 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/util/exception/L2Exception.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/util/exception/L2Exception.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.util.exception; diff --git a/l2jserver2-common/src/main/java/com/l2jserver/util/factory/CollectionFactory.java b/l2jserver2-common/src/main/java/com/l2jserver/util/factory/CollectionFactory.java index 77886d0cd..c7d0717c5 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/util/factory/CollectionFactory.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/util/factory/CollectionFactory.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.util.factory; diff --git a/l2jserver2-common/src/main/java/com/l2jserver/util/geometry/Coordinate.java b/l2jserver2-common/src/main/java/com/l2jserver/util/geometry/Coordinate.java index 4449b71a9..1c14a25cd 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/util/geometry/Coordinate.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/util/geometry/Coordinate.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.util.geometry; diff --git a/l2jserver2-common/src/main/java/com/l2jserver/util/geometry/Point.java b/l2jserver2-common/src/main/java/com/l2jserver/util/geometry/Point.java index 74c7a7dab..f784f8db8 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/util/geometry/Point.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/util/geometry/Point.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.util.geometry; diff --git a/l2jserver2-common/src/main/java/com/l2jserver/util/geometry/Point3D.java b/l2jserver2-common/src/main/java/com/l2jserver/util/geometry/Point3D.java index e6ccf9719..26cd12ac7 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/util/geometry/Point3D.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/util/geometry/Point3D.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.util.geometry; diff --git a/l2jserver2-common/src/main/java/com/l2jserver/util/transformer/Transformer.java b/l2jserver2-common/src/main/java/com/l2jserver/util/transformer/Transformer.java index 2e8244be9..aa1228cee 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/util/transformer/Transformer.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/util/transformer/Transformer.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.util.transformer; diff --git a/l2jserver2-common/src/main/java/com/l2jserver/util/transformer/TransformerFactory.java b/l2jserver2-common/src/main/java/com/l2jserver/util/transformer/TransformerFactory.java index 620d17738..6201e34e4 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/util/transformer/TransformerFactory.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/util/transformer/TransformerFactory.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.util.transformer; diff --git a/l2jserver2-common/src/main/java/com/l2jserver/util/transformer/impl/BooleanTransformer.java b/l2jserver2-common/src/main/java/com/l2jserver/util/transformer/impl/BooleanTransformer.java index f7db5c74b..dbc175ad9 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/util/transformer/impl/BooleanTransformer.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/util/transformer/impl/BooleanTransformer.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.util.transformer.impl; diff --git a/l2jserver2-common/src/main/java/com/l2jserver/util/transformer/impl/ByteTransformer.java b/l2jserver2-common/src/main/java/com/l2jserver/util/transformer/impl/ByteTransformer.java index d1c4d815e..b0222da37 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/util/transformer/impl/ByteTransformer.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/util/transformer/impl/ByteTransformer.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.util.transformer.impl; diff --git a/l2jserver2-common/src/main/java/com/l2jserver/util/transformer/impl/ClassTransformer.java b/l2jserver2-common/src/main/java/com/l2jserver/util/transformer/impl/ClassTransformer.java index b5fe0198d..1fd831b3a 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/util/transformer/impl/ClassTransformer.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/util/transformer/impl/ClassTransformer.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.util.transformer.impl; diff --git a/l2jserver2-common/src/main/java/com/l2jserver/util/transformer/impl/DoubleTransformer.java b/l2jserver2-common/src/main/java/com/l2jserver/util/transformer/impl/DoubleTransformer.java index be9f30205..76bca9599 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/util/transformer/impl/DoubleTransformer.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/util/transformer/impl/DoubleTransformer.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.util.transformer.impl; diff --git a/l2jserver2-common/src/main/java/com/l2jserver/util/transformer/impl/FileTransformer.java b/l2jserver2-common/src/main/java/com/l2jserver/util/transformer/impl/FileTransformer.java index 3cecfe42a..b3cd24491 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/util/transformer/impl/FileTransformer.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/util/transformer/impl/FileTransformer.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.util.transformer.impl; diff --git a/l2jserver2-common/src/main/java/com/l2jserver/util/transformer/impl/FloatTransformer.java b/l2jserver2-common/src/main/java/com/l2jserver/util/transformer/impl/FloatTransformer.java index 642641886..1d5ebf62f 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/util/transformer/impl/FloatTransformer.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/util/transformer/impl/FloatTransformer.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.util.transformer.impl; diff --git a/l2jserver2-common/src/main/java/com/l2jserver/util/transformer/impl/InetSocketAddressTransformer.java b/l2jserver2-common/src/main/java/com/l2jserver/util/transformer/impl/InetSocketAddressTransformer.java index 422217bf7..cffc89b90 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/util/transformer/impl/InetSocketAddressTransformer.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/util/transformer/impl/InetSocketAddressTransformer.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.util.transformer.impl; diff --git a/l2jserver2-common/src/main/java/com/l2jserver/util/transformer/impl/IntegerTransformer.java b/l2jserver2-common/src/main/java/com/l2jserver/util/transformer/impl/IntegerTransformer.java index c3fa27fae..d648642f7 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/util/transformer/impl/IntegerTransformer.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/util/transformer/impl/IntegerTransformer.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.util.transformer.impl; diff --git a/l2jserver2-common/src/main/java/com/l2jserver/util/transformer/impl/LongTransformer.java b/l2jserver2-common/src/main/java/com/l2jserver/util/transformer/impl/LongTransformer.java index 9a7f5e5f8..b2f0d1e5e 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/util/transformer/impl/LongTransformer.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/util/transformer/impl/LongTransformer.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.util.transformer.impl; diff --git a/l2jserver2-common/src/main/java/com/l2jserver/util/transformer/impl/PathTransformer.java b/l2jserver2-common/src/main/java/com/l2jserver/util/transformer/impl/PathTransformer.java index 1442fc3c8..b35ae6596 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/util/transformer/impl/PathTransformer.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/util/transformer/impl/PathTransformer.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.util.transformer.impl; diff --git a/l2jserver2-common/src/main/java/com/l2jserver/util/transformer/impl/ShortTransformer.java b/l2jserver2-common/src/main/java/com/l2jserver/util/transformer/impl/ShortTransformer.java index 9aec6fa4d..8d0ceba4d 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/util/transformer/impl/ShortTransformer.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/util/transformer/impl/ShortTransformer.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.util.transformer.impl; diff --git a/l2jserver2-common/src/main/java/com/l2jserver/util/transformer/impl/URITransformer.java b/l2jserver2-common/src/main/java/com/l2jserver/util/transformer/impl/URITransformer.java index 8d8be794d..aa77d1bce 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/util/transformer/impl/URITransformer.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/util/transformer/impl/URITransformer.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.util.transformer.impl; diff --git a/l2jserver2-common/src/main/java/com/l2jserver/util/transformer/impl/URLTransformer.java b/l2jserver2-common/src/main/java/com/l2jserver/util/transformer/impl/URLTransformer.java index bd00e45af..c6060aaf3 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/util/transformer/impl/URLTransformer.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/util/transformer/impl/URLTransformer.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.util.transformer.impl; diff --git a/l2jserver2-common/src/test/java/com/l2jserver/model/id/allocator/BitSetIDAllocatorTest.java b/l2jserver2-common/src/test/java/com/l2jserver/model/id/allocator/BitSetIDAllocatorTest.java index bcde55891..268b778ef 100644 --- a/l2jserver2-common/src/test/java/com/l2jserver/model/id/allocator/BitSetIDAllocatorTest.java +++ b/l2jserver2-common/src/test/java/com/l2jserver/model/id/allocator/BitSetIDAllocatorTest.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.id.allocator; diff --git a/l2jserver2-common/src/test/java/com/l2jserver/service/cache/SimpleCacheServiceTest.java b/l2jserver2-common/src/test/java/com/l2jserver/service/cache/SimpleCacheServiceTest.java index 398b75bd5..b333f14a5 100644 --- a/l2jserver2-common/src/test/java/com/l2jserver/service/cache/SimpleCacheServiceTest.java +++ b/l2jserver2-common/src/test/java/com/l2jserver/service/cache/SimpleCacheServiceTest.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.cache; diff --git a/l2jserver2-common/src/test/java/com/l2jserver/service/configuration/XMLConfigurationServiceTest.java b/l2jserver2-common/src/test/java/com/l2jserver/service/configuration/XMLConfigurationServiceTest.java index fe8e4a61b..16d1efac7 100644 --- a/l2jserver2-common/src/test/java/com/l2jserver/service/configuration/XMLConfigurationServiceTest.java +++ b/l2jserver2-common/src/test/java/com/l2jserver/service/configuration/XMLConfigurationServiceTest.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.configuration; diff --git a/l2jserver2-gameserver/data/script/ai/com/l2jserver/game/ai/MonsterAI.java b/l2jserver2-gameserver/data/script/ai/com/l2jserver/game/ai/MonsterAI.java index 784cc3980..7b148f791 100644 --- a/l2jserver2-gameserver/data/script/ai/com/l2jserver/game/ai/MonsterAI.java +++ b/l2jserver2-gameserver/data/script/ai/com/l2jserver/game/ai/MonsterAI.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.ai; diff --git a/l2jserver2-gameserver/data/script/ai/com/l2jserver/game/ai/NPCAI.java b/l2jserver2-gameserver/data/script/ai/com/l2jserver/game/ai/NPCAI.java index 37096e466..60410fe1b 100644 --- a/l2jserver2-gameserver/data/script/ai/com/l2jserver/game/ai/NPCAI.java +++ b/l2jserver2-gameserver/data/script/ai/com/l2jserver/game/ai/NPCAI.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.ai; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/GameServerModule.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/GameServerModule.java index a7fbf5895..799ce5b75 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/GameServerModule.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/GameServerModule.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/GeneralConfiguration.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/GeneralConfiguration.java index 8c1bfc749..c0435fd0d 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/GeneralConfiguration.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/GeneralConfiguration.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/L2JConstant.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/L2JConstant.java index f0338fe27..5543ac1a8 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/L2JConstant.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/L2JConstant.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/L2JGameServer.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/L2JGameServer.java index 376b08786..8f196902b 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/L2JGameServer.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/L2JGameServer.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/L2JGameServerMain.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/L2JGameServerMain.java index f3279307f..6ef003d2b 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/L2JGameServerMain.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/L2JGameServerMain.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/Lineage2Client.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/Lineage2Client.java index 6834c1e8a..c6ecb10c2 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/Lineage2Client.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/Lineage2Client.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net; @@ -31,7 +31,7 @@ import com.l2jserver.game.net.packet.server.SM_COMMUNITY_HTML; import com.l2jserver.game.net.packet.server.SM_HTML; import com.l2jserver.game.net.packet.server.SM_SYSTEM_MESSAGE; import com.l2jserver.model.id.object.CharacterID; -import com.l2jserver.model.template.ItemTemplate; +import com.l2jserver.model.template.item.ItemTemplate; import com.l2jserver.model.world.Item; import com.l2jserver.model.world.L2Character; import com.l2jserver.service.game.world.WorldService; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/Lineage2CryptographyKey.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/Lineage2CryptographyKey.java index 2872c828a..4529ec39b 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/Lineage2CryptographyKey.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/Lineage2CryptographyKey.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/Lineage2PipelineFactory.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/Lineage2PipelineFactory.java index 945710f46..2cbc75953 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/Lineage2PipelineFactory.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/Lineage2PipelineFactory.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/Lineage2Session.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/Lineage2Session.java index af95f91a6..56b0745a2 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/Lineage2Session.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/Lineage2Session.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/ProtocolVersion.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/ProtocolVersion.java index db064b958..d1988d42b 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/ProtocolVersion.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/ProtocolVersion.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/codec/Lineage2Decrypter.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/codec/Lineage2Decrypter.java index b52cee98a..db00b22dd 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/codec/Lineage2Decrypter.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/codec/Lineage2Decrypter.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net.codec; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/codec/Lineage2Encrypter.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/codec/Lineage2Encrypter.java index 7655b32c9..5df8c7580 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/codec/Lineage2Encrypter.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/codec/Lineage2Encrypter.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net.codec; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/codec/Lineage2FrameDecoder.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/codec/Lineage2FrameDecoder.java index afbc38100..18806405b 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/codec/Lineage2FrameDecoder.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/codec/Lineage2FrameDecoder.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net.codec; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/codec/Lineage2FrameEncoder.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/codec/Lineage2FrameEncoder.java index 61f4b8814..e9beadb05 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/codec/Lineage2FrameEncoder.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/codec/Lineage2FrameEncoder.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net.codec; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/codec/Lineage2PacketReader.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/codec/Lineage2PacketReader.java index 6ffcf6979..b5be17f5c 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/codec/Lineage2PacketReader.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/codec/Lineage2PacketReader.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net.codec; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/codec/Lineage2PacketWriter.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/codec/Lineage2PacketWriter.java index fbafc93ea..c851786f5 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/codec/Lineage2PacketWriter.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/codec/Lineage2PacketWriter.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net.codec; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/handler/Lineage2PacketHandler.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/handler/Lineage2PacketHandler.java index 7b90a797e..d1605b73c 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/handler/Lineage2PacketHandler.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/handler/Lineage2PacketHandler.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net.handler; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/AbstractClientPacket.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/AbstractClientPacket.java index 238c957ef..cb0af73d7 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/AbstractClientPacket.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/AbstractClientPacket.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net.packet; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/AbstractServerPacket.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/AbstractServerPacket.java index 3a22dd49c..5071dabc2 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/AbstractServerPacket.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/AbstractServerPacket.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net.packet; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/ClientPacket.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/ClientPacket.java index 70ecf199f..c5f3aec09 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/ClientPacket.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/ClientPacket.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net.packet; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/ClientPacketModule.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/ClientPacketModule.java index 9dd6cf7a6..658f8348c 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/ClientPacketModule.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/ClientPacketModule.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net.packet; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/Packet.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/Packet.java index 4b78f3bb9..17a2ebb35 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/Packet.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/Packet.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net.packet; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/PacketModule.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/PacketModule.java index 249b30099..242318e01 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/PacketModule.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/PacketModule.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net.packet; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/ServerPacket.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/ServerPacket.java index e40279583..fbec3b50e 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/ServerPacket.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/ServerPacket.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net.packet; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/ServerPacketModule.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/ServerPacketModule.java index 85a8da9e1..502035e7f 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/ServerPacketModule.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/ServerPacketModule.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net.packet; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_ACTION_USE.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_ACTION_USE.java index d6e5aefe6..4af6914d6 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_ACTION_USE.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_ACTION_USE.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net.packet.client; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_ADMIN_COMMAND.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_ADMIN_COMMAND.java index c8fb1a9b1..73662b228 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_ADMIN_COMMAND.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_ADMIN_COMMAND.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net.packet.client; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_ATTACK.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_ATTACK.java index ae160c9c4..8411efb98 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_ATTACK.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_ATTACK.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net.packet.client; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_AUTH_LOGIN.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_AUTH_LOGIN.java index 74c7ffac7..9221e898a 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_AUTH_LOGIN.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_AUTH_LOGIN.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net.packet.client; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_BYPASS.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_BYPASS.java index a56c4564d..06cba6488 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_BYPASS.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_BYPASS.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net.packet.client; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_ACTION.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_ACTION.java index 166001e4c..46055a499 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_ACTION.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_ACTION.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net.packet.client; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_APPEARING.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_APPEARING.java index 3627b5ea2..c02c2ec85 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_APPEARING.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_APPEARING.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net.packet.client; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_CREATE.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_CREATE.java index 358c43162..ad2483a46 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_CREATE.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_CREATE.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net.packet.client; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_MOVE.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_MOVE.java index b972c6010..4440e8f78 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_MOVE.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_MOVE.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net.packet.client; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_OPEN_MAP.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_OPEN_MAP.java index b2e3d4dcd..91829039e 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_OPEN_MAP.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_OPEN_MAP.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net.packet.client; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_POSITION.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_POSITION.java index e8f442aa3..77f0dadcc 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_POSITION.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_POSITION.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net.packet.client; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_REQ_INVENTORY.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_REQ_INVENTORY.java index a3e23d110..7a5088fd3 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_REQ_INVENTORY.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_REQ_INVENTORY.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net.packet.client; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_SELECT.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_SELECT.java index 4840d0362..2262df852 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_SELECT.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_SELECT.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net.packet.client; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAT.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAT.java index 533cb07d9..5dc00d2d2 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAT.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAT.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net.packet.client; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_ENTER_WORLD.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_ENTER_WORLD.java index aad33dca1..7518e227c 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_ENTER_WORLD.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_ENTER_WORLD.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net.packet.client; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_EXT_REQ_ALL_FORTRESS_INFO.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_EXT_REQ_ALL_FORTRESS_INFO.java index cb566334e..27042d90f 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_EXT_REQ_ALL_FORTRESS_INFO.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_EXT_REQ_ALL_FORTRESS_INFO.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net.packet.client; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_EXT_REQ_KEY_MAPPING.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_EXT_REQ_KEY_MAPPING.java index ffe169b3e..49156eeeb 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_EXT_REQ_KEY_MAPPING.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_EXT_REQ_KEY_MAPPING.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net.packet.client; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_EXT_REQ_MANOR_LIST.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_EXT_REQ_MANOR_LIST.java index 1bb6e2cd4..8dcceec97 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_EXT_REQ_MANOR_LIST.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_EXT_REQ_MANOR_LIST.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net.packet.client; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_EXT_REQ_SHORTCUT_REGISTRY.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_EXT_REQ_SHORTCUT_REGISTRY.java index 630a68157..92f6ca4cd 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_EXT_REQ_SHORTCUT_REGISTRY.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_EXT_REQ_SHORTCUT_REGISTRY.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net.packet.client; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_GG_KEY.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_GG_KEY.java index caec5919c..75faca68e 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_GG_KEY.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_GG_KEY.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net.packet.client; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_GOTO_LOBBY.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_GOTO_LOBBY.java index 2fc733b9d..9d9fa7c96 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_GOTO_LOBBY.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_GOTO_LOBBY.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net.packet.client; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_LOGOUT.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_LOGOUT.java index 310109a8f..fabf62106 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_LOGOUT.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_LOGOUT.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net.packet.client; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_PROTOCOL_VERSION.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_PROTOCOL_VERSION.java index 7a7fc2ffb..8a6a202e4 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_PROTOCOL_VERSION.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_PROTOCOL_VERSION.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net.packet.client; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_REQUEST_CHAR_TEMPLATE.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_REQUEST_CHAR_TEMPLATE.java index dfe7cb865..8be060b69 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_REQUEST_CHAR_TEMPLATE.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_REQUEST_CHAR_TEMPLATE.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net.packet.client; @@ -26,8 +26,8 @@ import com.l2jserver.game.net.packet.AbstractClientPacket; import com.l2jserver.game.net.packet.server.SM_CHAR_TEMPLATE; import com.l2jserver.model.id.template.CharacterTemplateID; import com.l2jserver.model.id.template.provider.CharacterTemplateIDProvider; -import com.l2jserver.model.template.CharacterTemplate; import com.l2jserver.model.template.character.CharacterClass; +import com.l2jserver.model.template.character.CharacterTemplate; /** * Requests the creation of a new Character. The list of character templates is diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_RESTART.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_RESTART.java index 2cb9c8518..ec0b7cda7 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_RESTART.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_RESTART.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net.packet.client; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_ACTION_FAILED.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_ACTION_FAILED.java index f6b5118d6..efb18487c 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_ACTION_FAILED.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_ACTION_FAILED.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net.packet.server; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_ACTOR_POSITION.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_ACTOR_POSITION.java index f9c18df4f..2ed13c4b5 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_ACTOR_POSITION.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_ACTOR_POSITION.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net.packet.server; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_ATTACK.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_ATTACK.java index abe44c689..4e9fc41f8 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_ATTACK.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_ATTACK.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net.packet.server; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_CREATE_FAIL.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_CREATE_FAIL.java index e7b6de441..414f88d06 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_CREATE_FAIL.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_CREATE_FAIL.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net.packet.server; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_CREATE_OK.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_CREATE_OK.java index 3bac40551..d2431704a 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_CREATE_OK.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_CREATE_OK.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net.packet.server; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INFO.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INFO.java index 6da8bc724..a454ae5c6 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INFO.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INFO.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net.packet.server; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INFO_BROADCAST.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INFO_BROADCAST.java index 1ebd762d6..06f7aff50 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INFO_BROADCAST.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INFO_BROADCAST.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net.packet.server; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INFO_EXTRA.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INFO_EXTRA.java index 97c9486ff..afc3344f2 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INFO_EXTRA.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INFO_EXTRA.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net.packet.server; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INVENTORY.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INVENTORY.java index 3b198c6ad..d6c095ff9 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INVENTORY.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INVENTORY.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net.packet.server; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_LIST.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_LIST.java index ae77d4050..343cea9a0 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_LIST.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_LIST.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net.packet.server; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_OPEN_MAP.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_OPEN_MAP.java index c57fec716..a265353a3 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_OPEN_MAP.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_OPEN_MAP.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net.packet.server; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_RESTART.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_RESTART.java index 412d20be7..4dc058288 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_RESTART.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_RESTART.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net.packet.server; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_SELECTED.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_SELECTED.java index a33c715f7..2d529c912 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_SELECTED.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_SELECTED.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net.packet.server; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_TEMPLATE.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_TEMPLATE.java index 294096669..ea9ce0349 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_TEMPLATE.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_TEMPLATE.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net.packet.server; @@ -20,7 +20,7 @@ import org.jboss.netty.buffer.ChannelBuffer; import com.l2jserver.game.net.Lineage2Client; import com.l2jserver.game.net.packet.AbstractServerPacket; -import com.l2jserver.model.template.CharacterTemplate; +import com.l2jserver.model.template.character.CharacterTemplate; /** * An packet that sends all character templates to the client. diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAT.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAT.java index 05187746c..31972c5de 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAT.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAT.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net.packet.server; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_COMMUNITY_HTML.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_COMMUNITY_HTML.java index 39c3a466b..bd65d59d0 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_COMMUNITY_HTML.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_COMMUNITY_HTML.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net.packet.server; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_DIE.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_DIE.java index 05eaac6cb..754833ca5 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_DIE.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_DIE.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net.packet.server; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_ENTER_WORLD.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_ENTER_WORLD.java index 3b61efa60..b10b756b9 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_ENTER_WORLD.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_ENTER_WORLD.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net.packet.server; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_FORT_INFO.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_FORT_INFO.java index 8b7aec1da..1d447e5d4 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_FORT_INFO.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_FORT_INFO.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net.packet.server; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_GG_QUERY.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_GG_QUERY.java index 3847be749..3b90bcaf0 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_GG_QUERY.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_GG_QUERY.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net.packet.server; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_HTML.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_HTML.java index 8b07681c9..88950b35a 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_HTML.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_HTML.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net.packet.server; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_ITEM_GROUND.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_ITEM_GROUND.java index 612528415..532059a51 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_ITEM_GROUND.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_ITEM_GROUND.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net.packet.server; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_KEY.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_KEY.java index 887d4f61c..35590aa90 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_KEY.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_KEY.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net.packet.server; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_MANOR_LIST.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_MANOR_LIST.java index ca6e47d5d..a9d06c8da 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_MANOR_LIST.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_MANOR_LIST.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net.packet.server; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_MOVE.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_MOVE.java index bf3a074df..4819666bf 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_MOVE.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_MOVE.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net.packet.server; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_MOVE_TYPE.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_MOVE_TYPE.java index 00a6d6966..83160bdfd 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_MOVE_TYPE.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_MOVE_TYPE.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net.packet.server; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_NPC_INFO.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_NPC_INFO.java index 93b8ddb53..cfc7f8774 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_NPC_INFO.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_NPC_INFO.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net.packet.server; @@ -20,7 +20,7 @@ import org.jboss.netty.buffer.ChannelBuffer; import com.l2jserver.game.net.Lineage2Client; import com.l2jserver.game.net.packet.AbstractServerPacket; -import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.template.npc.NPCTemplate; import com.l2jserver.model.world.NPC; import com.l2jserver.util.BufferUtils; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_OBJECT_REMOVE.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_OBJECT_REMOVE.java index a1a29d4fd..1bcf0b7e6 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_OBJECT_REMOVE.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_OBJECT_REMOVE.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net.packet.server; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_SERVER_OBJECT.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_SERVER_OBJECT.java index 50cd25c78..56200684d 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_SERVER_OBJECT.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_SERVER_OBJECT.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net.packet.server; @@ -20,7 +20,7 @@ import org.jboss.netty.buffer.ChannelBuffer; import com.l2jserver.game.net.Lineage2Client; import com.l2jserver.game.net.packet.AbstractServerPacket; -import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.template.npc.NPCTemplate; import com.l2jserver.model.world.NPC; import com.l2jserver.util.BufferUtils; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_STATUS_UPDATE.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_STATUS_UPDATE.java index f7796dac3..f0b793160 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_STATUS_UPDATE.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_STATUS_UPDATE.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net.packet.server; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_STOP.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_STOP.java index bcb4f77b9..569832180 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_STOP.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_STOP.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net.packet.server; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_SYSTEM_MESSAGE.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_SYSTEM_MESSAGE.java index 2963bebdb..206e217f6 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_SYSTEM_MESSAGE.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_SYSTEM_MESSAGE.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net.packet.server; @@ -25,8 +25,8 @@ import com.l2jserver.game.net.SystemMessage; import com.l2jserver.game.net.packet.AbstractServerPacket; import com.l2jserver.model.game.Fort; import com.l2jserver.model.game.Skill; -import com.l2jserver.model.template.ItemTemplate; import com.l2jserver.model.template.SkillTemplate; +import com.l2jserver.model.template.item.ItemTemplate; import com.l2jserver.model.world.Actor; import com.l2jserver.model.world.Item; import com.l2jserver.util.BufferUtils; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_TARGET.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_TARGET.java index 879c1002b..8bb9e6033 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_TARGET.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_TARGET.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net.packet.server; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_TELEPORT.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_TELEPORT.java index 80b4f35a7..700da39ca 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_TELEPORT.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_TELEPORT.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.game.net.packet.server; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/AbstractModel.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/AbstractModel.java index 8a01afcdd..401e87266 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/AbstractModel.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/AbstractModel.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/Model.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/Model.java index 3a6a42399..62fb20ee9 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/Model.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/Model.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/dao/CharacterDAO.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/dao/CharacterDAO.java index b4f91f465..ea186d851 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/dao/CharacterDAO.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/dao/CharacterDAO.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.dao; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/dao/CharacterFriendDAO.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/dao/CharacterFriendDAO.java index 19740fd6c..0f1d988e2 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/dao/CharacterFriendDAO.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/dao/CharacterFriendDAO.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.dao; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/dao/ChatMessageDAO.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/dao/ChatMessageDAO.java index a4e614517..1a85c808f 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/dao/ChatMessageDAO.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/dao/ChatMessageDAO.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.dao; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/dao/ClanDAO.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/dao/ClanDAO.java index 43fa7ee4c..39ce94f17 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/dao/ClanDAO.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/dao/ClanDAO.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.dao; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/dao/ItemDAO.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/dao/ItemDAO.java index b39a58f4f..478329d93 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/dao/ItemDAO.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/dao/ItemDAO.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.dao; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/dao/NPCDAO.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/dao/NPCDAO.java index b0a6917a1..e6cbf531c 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/dao/NPCDAO.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/dao/NPCDAO.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.dao; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/dao/PetDAO.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/dao/PetDAO.java index 9c6b481e7..0283be592 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/dao/PetDAO.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/dao/PetDAO.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.dao; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/game/Castle.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/game/Castle.java index 9fd921990..6cdea2e95 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/game/Castle.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/game/Castle.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.game; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/game/CharacterFriend.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/game/CharacterFriend.java index 7a10a9ab4..d064151df 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/game/CharacterFriend.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/game/CharacterFriend.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.game; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/game/Fort.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/game/Fort.java index 1113a4ead..1792c76a9 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/game/Fort.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/game/Fort.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.game; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/game/Shortcut.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/game/Shortcut.java index 118f50a5b..0b39e07ca 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/game/Shortcut.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/game/Shortcut.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.game; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/game/Skill.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/game/Skill.java index 4218f49b7..3ccb6a482 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/game/Skill.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/game/Skill.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.game; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/AbstractModelID.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/AbstractModelID.java index 83bfde5c5..5767b7151 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/AbstractModelID.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/AbstractModelID.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.id; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/AccountID.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/AccountID.java index 7e4c0d68c..efbaf45f0 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/AccountID.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/AccountID.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.id; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/CastleID.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/CastleID.java index 5c871f49e..2a401a95e 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/CastleID.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/CastleID.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.id; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/ChatMessageID.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/ChatMessageID.java index 604e808ab..7e67d2f87 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/ChatMessageID.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/ChatMessageID.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.id; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/FortID.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/FortID.java index fdfa46c40..136629087 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/FortID.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/FortID.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.id; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/FriendID.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/FriendID.java index da54c6dfa..625555a41 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/FriendID.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/FriendID.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.id; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/ID.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/ID.java index 35d5c673c..b9ecf2a92 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/ID.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/ID.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.id; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/ObjectID.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/ObjectID.java index faad8394e..e44fe5fa2 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/ObjectID.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/ObjectID.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.id; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/ShortcutID.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/ShortcutID.java index b450cf0ab..90177e0e4 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/ShortcutID.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/ShortcutID.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.id; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/SkillID.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/SkillID.java index 98c27c537..72fa1c3ce 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/SkillID.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/SkillID.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.id; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/TemplateID.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/TemplateID.java index e42731edd..7f8c8530b 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/TemplateID.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/TemplateID.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.id; @@ -37,7 +37,7 @@ import com.l2jserver.service.game.template.TemplateService; * * @author Rogiel */ -public abstract class TemplateID, I> extends ID { +public abstract class TemplateID extends ID { /** * The cached template {@link Reference} *

@@ -65,7 +65,7 @@ public abstract class TemplateID, I> extends ID { */ public T getTemplate() { if (cached == null || cached.get() == null) - cached = new SoftReference(loadTemplate()); + cached = createReference(loadTemplate()); return cached.get(); } @@ -75,4 +75,16 @@ public abstract class TemplateID, I> extends ID { * @return the {@link Template} if existent, null otherwise */ protected abstract T loadTemplate(); + + /** + * Creates a new reference for the given template. TemplateID + * implementations can override this method if desired another reference. + * + * @param template + * the template object + * @return the newly created {@link Reference} + */ + protected Reference createReference(T template) { + return new SoftReference(template); + } } diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/compound/AbstractCompoundID.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/compound/AbstractCompoundID.java index 72e51fa72..5cd65b9df 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/compound/AbstractCompoundID.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/compound/AbstractCompoundID.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.id.compound; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/ActorID.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/ActorID.java index 0933cc9e6..e4d5ed530 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/ActorID.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/ActorID.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.id.object; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/CharacterID.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/CharacterID.java index 578990d0f..d489b403e 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/CharacterID.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/CharacterID.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.id.object; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/ClanID.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/ClanID.java index 37b4deaba..d032d6181 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/ClanID.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/ClanID.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.id.object; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/ItemID.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/ItemID.java index ddd8d2661..7d0df088b 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/ItemID.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/ItemID.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.id.object; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/NPCID.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/NPCID.java index 9f0921742..71436cc77 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/NPCID.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/NPCID.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.id.object; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/PetID.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/PetID.java index 72609cb56..62fa49f7c 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/PetID.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/PetID.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.id.object; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/allocator/BitSetIDAllocator.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/allocator/BitSetIDAllocator.java index 4c50e0dad..ed65a0d16 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/allocator/BitSetIDAllocator.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/allocator/BitSetIDAllocator.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.id.object.allocator; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/allocator/IDAllocator.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/allocator/IDAllocator.java index 1854e9ab8..dade608ca 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/allocator/IDAllocator.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/allocator/IDAllocator.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.id.object.allocator; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/allocator/IDAllocatorException.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/allocator/IDAllocatorException.java index d3b85fee8..dfef4cfe3 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/allocator/IDAllocatorException.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/allocator/IDAllocatorException.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.id.object.allocator; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/iterator/WorldObjectIterable.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/iterator/WorldObjectIterable.java index ae133e535..839aae344 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/iterator/WorldObjectIterable.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/iterator/WorldObjectIterable.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.id.object.iterator; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/iterator/WorldObjectIterator.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/iterator/WorldObjectIterator.java index 222a8a7be..79c96ac05 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/iterator/WorldObjectIterator.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/iterator/WorldObjectIterator.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.id.object.iterator; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/provider/CharacterIDProvider.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/provider/CharacterIDProvider.java index 264561606..5b78b887b 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/provider/CharacterIDProvider.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/provider/CharacterIDProvider.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.id.object.provider; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/provider/ClanIDProvider.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/provider/ClanIDProvider.java index d279ce680..539eb807c 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/provider/ClanIDProvider.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/provider/ClanIDProvider.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.id.object.provider; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/provider/ItemIDProvider.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/provider/ItemIDProvider.java index 2adf05e88..441812779 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/provider/ItemIDProvider.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/provider/ItemIDProvider.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.id.object.provider; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/provider/NPCIDProvider.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/provider/NPCIDProvider.java index 3c0829358..1eea0a3cf 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/provider/NPCIDProvider.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/provider/NPCIDProvider.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.id.object.provider; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/provider/ObjectIDProvider.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/provider/ObjectIDProvider.java index d90aba6fa..ccd508ef7 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/provider/ObjectIDProvider.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/provider/ObjectIDProvider.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.id.object.provider; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/provider/ObjectIDResolver.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/provider/ObjectIDResolver.java index 5f7dcdd50..270f278c3 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/provider/ObjectIDResolver.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/provider/ObjectIDResolver.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.id.object.provider; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/provider/PetIDProvider.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/provider/PetIDProvider.java index 90787c8ee..838d7bd5a 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/provider/PetIDProvider.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/provider/PetIDProvider.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.id.object.provider; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/provider/AccountIDProvider.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/provider/AccountIDProvider.java index e622c789d..82aac6f56 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/provider/AccountIDProvider.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/provider/AccountIDProvider.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.id.provider; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/provider/CastleIDProvider.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/provider/CastleIDProvider.java index 8333cc88a..4d16e8250 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/provider/CastleIDProvider.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/provider/CastleIDProvider.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.id.provider; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/provider/ChatMessageIDProvider.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/provider/ChatMessageIDProvider.java index be2be8525..bff2c39cf 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/provider/ChatMessageIDProvider.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/provider/ChatMessageIDProvider.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.id.provider; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/provider/CompoundIDProvider.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/provider/CompoundIDProvider.java index b02216822..472074cd7 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/provider/CompoundIDProvider.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/provider/CompoundIDProvider.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.id.provider; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/provider/FortIDProvider.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/provider/FortIDProvider.java index 699f524f8..f73c87400 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/provider/FortIDProvider.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/provider/FortIDProvider.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.id.provider; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/provider/FriendIDProvider.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/provider/FriendIDProvider.java index 2012bc825..6bea98e54 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/provider/FriendIDProvider.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/provider/FriendIDProvider.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.id.provider; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/provider/IDProvider.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/provider/IDProvider.java index e7c1abdf8..34e051e08 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/provider/IDProvider.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/provider/IDProvider.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.id.provider; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/provider/IDProviderModule.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/provider/IDProviderModule.java index 76a31049a..52c3db917 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/provider/IDProviderModule.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/provider/IDProviderModule.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.id.provider; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/ActorTemplateID.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/ActorTemplateID.java index 00852cab1..5eb5bd61b 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/ActorTemplateID.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/ActorTemplateID.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.id.template; @@ -21,7 +21,7 @@ import javax.xml.bind.annotation.XmlTransient; import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; import com.l2jserver.model.id.TemplateID; -import com.l2jserver.model.template.ActorTemplate; +import com.l2jserver.model.template.actor.ActorTemplate; import com.l2jserver.service.game.template.TemplateService; /** diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/CharacterTemplateID.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/CharacterTemplateID.java index 84ef4a54d..b2bb2a4b2 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/CharacterTemplateID.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/CharacterTemplateID.java @@ -1,25 +1,25 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.id.template; import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; import com.l2jserver.model.id.TemplateID; -import com.l2jserver.model.template.CharacterTemplate; +import com.l2jserver.model.template.character.CharacterTemplate; import com.l2jserver.service.game.template.TemplateService; /** diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/EffectTemplateID.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/EffectTemplateID.java new file mode 100644 index 000000000..9c932a8ad --- /dev/null +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/EffectTemplateID.java @@ -0,0 +1,52 @@ +/* + * This file is part of l2jserver2 . + * + * l2jserver2 is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver2 is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver2. If not, see . + */ +package com.l2jserver.model.id.template; + +import com.google.inject.Inject; +import com.google.inject.assistedinject.Assisted; +import com.l2jserver.model.id.TemplateID; +import com.l2jserver.model.template.effect.EffectTemplate; +import com.l2jserver.service.game.template.TemplateService; + +/** + * An {@link TemplateID} instance representing an {@link EffectTemplate} object + * + * @author Rogiel + */ +public class EffectTemplateID extends TemplateID { + /** + * The template service + */ + private transient final TemplateService templateService; + + /** + * @param id + * the raw id + * @param templateService + * the template service + */ + @Inject + public EffectTemplateID(@Assisted int id, TemplateService templateService) { + super(id); + this.templateService = templateService; + } + + @Override + public EffectTemplate loadTemplate() { + return templateService.getTemplate(this); + } +} diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/ItemTemplateID.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/ItemTemplateID.java index f8b4c8327..36d1715b1 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/ItemTemplateID.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/ItemTemplateID.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.id.template; @@ -21,7 +21,7 @@ import javax.xml.bind.annotation.XmlTransient; import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; import com.l2jserver.model.id.TemplateID; -import com.l2jserver.model.template.ItemTemplate; +import com.l2jserver.model.template.item.ItemTemplate; import com.l2jserver.service.game.template.TemplateService; /** diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/NPCTemplateID.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/NPCTemplateID.java index e50a1fb98..d9c5618f5 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/NPCTemplateID.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/NPCTemplateID.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.id.template; @@ -21,7 +21,7 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; import com.l2jserver.model.id.TemplateID; -import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.template.npc.NPCTemplate; import com.l2jserver.service.game.template.TemplateService; import com.l2jserver.util.jaxb.NPCTemplateIDAdapter; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/SkillTemplateID.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/SkillTemplateID.java index f3917a23d..82d21c6fe 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/SkillTemplateID.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/SkillTemplateID.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.id.template; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/TeleportationTemplateID.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/TeleportationTemplateID.java index 0659a1e27..2bdc1879f 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/TeleportationTemplateID.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/TeleportationTemplateID.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.id.template; @@ -22,7 +22,7 @@ import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; import com.l2jserver.model.id.TemplateID; import com.l2jserver.model.template.SkillTemplate; -import com.l2jserver.model.template.TeleportationTemplate; +import com.l2jserver.model.template.npc.TeleportationTemplate; import com.l2jserver.service.game.template.TemplateService; import com.l2jserver.util.jaxb.TeleportationTemplateIDAdapter; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/provider/CharacterTemplateIDProvider.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/provider/CharacterTemplateIDProvider.java index bb109a084..21a530b0f 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/provider/CharacterTemplateIDProvider.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/provider/CharacterTemplateIDProvider.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.id.template.provider; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/capability/Sellable.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/provider/EffectTemplateIDProvider.java similarity index 50% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/capability/Sellable.java rename to l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/provider/EffectTemplateIDProvider.java index 77bcbb863..7fcb02bbd 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/capability/Sellable.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/provider/EffectTemplateIDProvider.java @@ -1,29 +1,28 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ -package com.l2jserver.model.template.capability; +package com.l2jserver.model.id.template.provider; -import com.l2jserver.model.template.Template; +import com.l2jserver.model.id.template.EffectTemplateID; /** - * Defines an {@link Template template} {@link TemplateCapability capability} - * that can be selled. + * Creates new {@link EffectTemplateID} instances * * @author Rogiel */ -public interface Sellable extends TemplateCapability { - +public interface EffectTemplateIDProvider extends + TemplateIDProvider { } diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/provider/ItemTemplateIDProvider.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/provider/ItemTemplateIDProvider.java index de3a469a5..a717e8e4a 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/provider/ItemTemplateIDProvider.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/provider/ItemTemplateIDProvider.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.id.template.provider; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/provider/NPCTemplateIDProvider.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/provider/NPCTemplateIDProvider.java index b41850ad9..bf1d0d865 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/provider/NPCTemplateIDProvider.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/provider/NPCTemplateIDProvider.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.id.template.provider; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/provider/SkillTemplateIDProvider.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/provider/SkillTemplateIDProvider.java index 20fc5f41b..40fe75237 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/provider/SkillTemplateIDProvider.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/provider/SkillTemplateIDProvider.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.id.template.provider; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/provider/TeleportationTemplateIDProvider.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/provider/TeleportationTemplateIDProvider.java index 5483d7b43..5fe903d6f 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/provider/TeleportationTemplateIDProvider.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/provider/TeleportationTemplateIDProvider.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.id.template.provider; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/provider/TemplateIDProvider.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/provider/TemplateIDProvider.java index 133d9f1a2..a4018b0c7 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/provider/TemplateIDProvider.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/provider/TemplateIDProvider.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.id.template.provider; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/server/AttackHit.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/server/AttackHit.java index 48a598cd5..6c698d7a6 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/server/AttackHit.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/server/AttackHit.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.server; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/server/ChatMessage.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/server/ChatMessage.java index 3cdc6d8af..fd2294119 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/server/ChatMessage.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/server/ChatMessage.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.server; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/server/attack/AttackCalculator.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/server/attack/AttackCalculator.java index 537dc19bb..f32c82daf 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/server/attack/AttackCalculator.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/server/attack/AttackCalculator.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.server.attack; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/server/attack/AttackCalculatorContext.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/server/attack/AttackCalculatorContext.java index e7ce9c692..c913d0059 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/server/attack/AttackCalculatorContext.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/server/attack/AttackCalculatorContext.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.server.attack; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/server/attack/AttackCalculatorFunction.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/server/attack/AttackCalculatorFunction.java index 6ec72e7be..009178af1 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/server/attack/AttackCalculatorFunction.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/server/attack/AttackCalculatorFunction.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.server.attack; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/server/attack/PhysicalAttackCalculator.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/server/attack/PhysicalAttackCalculator.java index 8947a29e6..7d6a37d05 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/server/attack/PhysicalAttackCalculator.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/server/attack/PhysicalAttackCalculator.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.server.attack; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/AbstractTemplate.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/AbstractTemplate.java index 05a96cf11..c49d08441 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/AbstractTemplate.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/AbstractTemplate.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.template; @@ -24,26 +24,9 @@ import com.l2jserver.model.id.TemplateID; * An abstract {@link Template} * * @author Rogiel - * - * @param - * the type of object created by this template */ @XmlType(name = "AbstractTemplateType") -public abstract class AbstractTemplate implements Template { - // /** - // * The {@link TemplateID} - // */ - // private final TemplateID id; - - // /** - // * Creates a new instance - // * - // * @param id - // */ - // protected AbstractTemplate(TemplateID id) { - // this.id = id; - // } - +public abstract class AbstractTemplate implements Template { @Override public abstract TemplateID getID(); } diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/AugmentTemplate.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/AugmentTemplate.java index 5bf34cb07..43dfe3bae 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/AugmentTemplate.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/AugmentTemplate.java @@ -1,28 +1,33 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.template; + /** * Template for an Aumentation * * @author Rogiel */ -public abstract class AugmentTemplate extends AbstractTemplate { - @Override +public abstract class AugmentTemplate extends AbstractTemplate { + /** + * Create a new {@link Object} + * + * @return the created object + */ public Object create() { return null; } diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/EffectTemplate.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/EffectTemplate.java deleted file mode 100644 index 01119ad34..000000000 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/EffectTemplate.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * This file is part of l2jserver . - * - * l2jserver is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * l2jserver is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . - */ -package com.l2jserver.model.template; - -import com.l2jserver.model.world.Actor; - -/** - * Template for effects - * - * @author Rogiel - */ -public abstract class EffectTemplate extends AbstractTemplate { - @Override - public Object create() { - return null; - } - - /** - * Adds this effect to the given actor - * - * @param actor - * the actor - */ - public void apply(Actor actor) { - - } - - // @Override - // public ItemTemplateID getID() { - // return (ItemTemplateID) super.getID(); - // } -} diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/SkillTemplate.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/SkillTemplate.java index 60a716a8a..eeaaec339 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/SkillTemplate.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/SkillTemplate.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.template; @@ -31,8 +31,8 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import com.l2jserver.model.game.Skill; import com.l2jserver.model.id.object.ActorID; import com.l2jserver.model.id.template.SkillTemplateID; -import com.l2jserver.model.template.skill.SkillEffect; -import com.l2jserver.model.template.skill.effect.TeleportEffect; +import com.l2jserver.model.template.effect.EffectTemplate; +import com.l2jserver.model.template.effect.TeleportEffectTemplate; import com.l2jserver.util.factory.CollectionFactory; import com.l2jserver.util.jaxb.SkillTemplateIDAdapter; @@ -44,7 +44,7 @@ import com.l2jserver.util.jaxb.SkillTemplateIDAdapter; @XmlRootElement(name = "skill", namespace = "http://schemas.l2jserver2.com/skill") @XmlType(namespace = "http://schemas.l2jserver2.com/skill", name = "SkillType") @XmlAccessorType(XmlAccessType.FIELD) -public class SkillTemplate extends AbstractTemplate { +public class SkillTemplate extends AbstractTemplate { @XmlAttribute(name = "id", required = true) @XmlJavaTypeAdapter(value = SkillTemplateIDAdapter.class) protected SkillTemplateID id; @@ -60,10 +60,14 @@ public class SkillTemplate extends AbstractTemplate { */ protected int maximumLevel = 1; - @XmlElements({ @XmlElement(name = "teleport", type = TeleportEffect.class) }) - protected List effects = CollectionFactory.newList(); + @XmlElements({ @XmlElement(name = "teleport", type = TeleportEffectTemplate.class) }) + protected List effects = CollectionFactory.newList(); - @Override + /** + * Create a new {@link Skill} + * + * @return the created object + */ public Skill create() { return create(null); } @@ -122,7 +126,7 @@ public class SkillTemplate extends AbstractTemplate { /** * @return the effects */ - public List getEffects() { + public List getEffects() { return Collections.unmodifiableList(effects); } @@ -136,8 +140,8 @@ public class SkillTemplate extends AbstractTemplate { * @return the effect found, if any. */ @SuppressWarnings("unchecked") - public E getEffect(Class effectType) { - for (final SkillEffect effect : effects) { + public E getEffect(Class effectType) { + for (final EffectTemplate effect : effects) { if (effectType.isInstance(effect)) return (E) effect; } diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/Template.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/Template.java index 6f28ec757..9e7ba1e02 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/Template.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/Template.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.template; @@ -25,18 +25,8 @@ import com.l2jserver.model.world.WorldObject; * the need of setting the new objects parameters. * * @author Rogiel - * - * @param - * the {@link WorldObject} type */ -public interface Template { - /** - * Create a new {@link WorldObject} - * - * @return the created object - */ - T create(); - +public interface Template { /** * Return this {@link TemplateID} * diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/ActorTemplate.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/actor/ActorTemplate.java similarity index 69% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/ActorTemplate.java rename to l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/actor/ActorTemplate.java index c7fa7b50d..c391ce2d3 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/ActorTemplate.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/actor/ActorTemplate.java @@ -1,26 +1,27 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ -package com.l2jserver.model.template; +package com.l2jserver.model.template.actor; import javax.xml.bind.annotation.XmlType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.l2jserver.model.template.AbstractTemplate; import com.l2jserver.model.world.Actor; /** @@ -31,15 +32,18 @@ import com.l2jserver.model.world.Actor; * @author Rogiel */ @XmlType(name = "AbstractActorType") -public abstract class ActorTemplate extends - AbstractTemplate { +public abstract class ActorTemplate extends AbstractTemplate { /** * The logger */ private static final Logger log = LoggerFactory .getLogger(ActorTemplate.class); - @Override + /** + * Create a new {@link Actor} + * + * @return the created object + */ public T create() { log.debug("Creating a new Actor instance with template {}", this); final T actor = createInstance(); diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/calculator/ItemSetActorCalculator.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/calculator/ItemSetActorCalculator.java index 3e5959b3b..e73805303 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/calculator/ItemSetActorCalculator.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/calculator/ItemSetActorCalculator.java @@ -1,23 +1,23 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.template.calculator; -import com.l2jserver.model.template.ActorTemplate; -import com.l2jserver.model.template.ItemTemplate.StatAttribute.StatSet; +import com.l2jserver.model.template.actor.ActorTemplate; +import com.l2jserver.model.template.item.ItemTemplate.StatAttribute.StatSet; import com.l2jserver.model.world.Actor; import com.l2jserver.model.world.actor.calculator.ActorFormula; import com.l2jserver.model.world.actor.stat.StatType; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/capability/Dropable.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/capability/Dropable.java deleted file mode 100644 index 9aff2d17c..000000000 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/capability/Dropable.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * This file is part of l2jserver . - * - * l2jserver is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * l2jserver is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . - */ -package com.l2jserver.model.template.capability; - -import com.l2jserver.model.template.Template; - -/** - * Defines an {@link Template template} {@link TemplateCapability capability} - * that can be selled. - * - * @author Rogiel - */ -public interface Dropable extends TemplateCapability { - -} diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/capability/Enchantable.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/capability/Enchantable.java deleted file mode 100644 index 5184d277d..000000000 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/capability/Enchantable.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * This file is part of l2jserver . - * - * l2jserver is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * l2jserver is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . - */ -package com.l2jserver.model.template.capability; - -import com.l2jserver.model.template.Template; - -/** - * Defines an {@link Template template} {@link TemplateCapability capability} - * for an object that can be enchanted. - * - * @author Rogiel - */ -public interface Enchantable extends TemplateCapability { - -} diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/capability/Interactable.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/capability/Interactable.java deleted file mode 100644 index bf8a7713f..000000000 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/capability/Interactable.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * This file is part of l2jserver . - * - * l2jserver is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * l2jserver is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . - */ -package com.l2jserver.model.template.capability; - -import com.l2jserver.model.template.Template; -import com.l2jserver.model.world.L2Character; -import com.l2jserver.model.world.WorldObject; -import com.l2jserver.util.exception.L2Exception; - -/** - * Defines an {@link Template} which the player can interact with - * - * @param - * the interable {@link WorldObject} type - * @author Rogiel - */ -public interface Interactable extends TemplateCapability { - /** - * Performs an interaction with this template. - * - * @param object - * the object to interact with - * @param character - * the interacting character - * @param args - * the action arguments - * @throws L2Exception - * any {@link L2Exception} - */ - void action(T object, L2Character character, String... args) - throws L2Exception; -} diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/capability/TemplateCapability.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/capability/TemplateCapability.java deleted file mode 100644 index 28084639b..000000000 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/capability/TemplateCapability.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * This file is part of l2jserver . - * - * l2jserver is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * l2jserver is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . - */ -package com.l2jserver.model.template.capability; - -import com.l2jserver.model.template.Template; - -/** - * Defines an {@link Template template} {@link TemplateCapability capability}. - * Each capability is something that the template "knows" and "can" do. - * - * @author Rogiel - */ -public interface TemplateCapability { -} diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/capability/Tradable.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/capability/Tradable.java deleted file mode 100644 index ed1ca453f..000000000 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/capability/Tradable.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * This file is part of l2jserver . - * - * l2jserver is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * l2jserver is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . - */ -package com.l2jserver.model.template.capability; - -import com.l2jserver.model.template.Template; - -/** - * Defines an {@link Template template} {@link TemplateCapability capability} - * that can be selled. - * - * @author Rogiel - */ -public interface Tradable extends TemplateCapability { - -} diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/character/CharacterClass.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/character/CharacterClass.java index c03571768..04bbae610 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/character/CharacterClass.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/character/CharacterClass.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.template.character; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/CharacterTemplate.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/character/CharacterTemplate.java similarity index 98% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/CharacterTemplate.java rename to l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/character/CharacterTemplate.java index 4d8e33f65..573d9e5d7 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/CharacterTemplate.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/character/CharacterTemplate.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General public License * along with l2jserver. If not, see . */ -package com.l2jserver.model.template; +package com.l2jserver.model.template.character; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; @@ -25,8 +25,7 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import com.l2jserver.model.id.template.CharacterTemplateID; -import com.l2jserver.model.template.character.CharacterClass; -import com.l2jserver.model.template.character.CharacterRace; +import com.l2jserver.model.template.actor.ActorTemplate; import com.l2jserver.model.world.L2Character; import com.l2jserver.util.jaxb.CharacterTemplateIDAdapter; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/effect/EffectTemplate.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/effect/EffectTemplate.java new file mode 100644 index 000000000..224474b4f --- /dev/null +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/effect/EffectTemplate.java @@ -0,0 +1,57 @@ +/* + * This file is part of l2jserver2 . + * + * l2jserver2 is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver2 is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver2. If not, see . + */ +package com.l2jserver.model.template.effect; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.bind.annotation.XmlType; + +import com.l2jserver.model.id.template.EffectTemplateID; +import com.l2jserver.model.template.Template; +import com.l2jserver.model.world.Actor; +import com.l2jserver.model.world.actor.effect.Effect; + +/** + * @author Rogiel + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "Effect") +@XmlSeeAlso({ TeleportEffectTemplate.class }) +public abstract class EffectTemplate implements Template { + @XmlAttribute(name = "id") + protected EffectTemplateID id; + + protected EffectTemplate() { + this.id = null; + } + + /** + * Creates a new effect for the given actor + * + * @param actor + * the actor + * @return the newly created effect + */ + public abstract Effect createEffect(Actor actor); + + @Override + public EffectTemplateID getID() { + return id; + } +} diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/effect/TeleportEffectTemplate.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/effect/TeleportEffectTemplate.java new file mode 100644 index 000000000..f9b666985 --- /dev/null +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/effect/TeleportEffectTemplate.java @@ -0,0 +1,75 @@ +/* + * This file is part of l2jserver2 . + * + * l2jserver2 is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver2 is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver2. If not, see . + */ +package com.l2jserver.model.template.effect; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlType; + +import com.google.inject.Inject; +import com.l2jserver.model.world.Actor; +import com.l2jserver.model.world.actor.effect.AbstractEffect; +import com.l2jserver.model.world.actor.effect.Effect; +import com.l2jserver.service.game.spawn.CharacterAlreadyTeleportingServiceException; +import com.l2jserver.service.game.spawn.NotSpawnedServiceException; +import com.l2jserver.service.game.spawn.SpawnService; +import com.l2jserver.util.geometry.Coordinate; + +/** + * @author Rogiel + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "TeleportEffect") +public class TeleportEffectTemplate extends EffectTemplate { + public enum SkillTeleportEffectLocation { + TARGET, OFFSET_FROM_TARGET, POINT; + } + + @XmlAttribute(name = "type", required = false) + private SkillTeleportEffectLocation type = SkillTeleportEffectLocation.TARGET; + @XmlAttribute(name = "point") + private Coordinate coordinate; + + /** + * Creates a new instance + */ + private TeleportEffectTemplate() { + super(); + } + + @Override + public Effect createEffect(Actor actor) { + return new AbstractEffect(this, actor) { + @Inject + private SpawnService spawnService; + + @Override + public void applyEffect() throws NotSpawnedServiceException, + CharacterAlreadyTeleportingServiceException { + spawnService.teleport(actor, template.coordinate); + } + }; + } + + /** + * @return the teleport effect type + */ + public SkillTeleportEffectLocation getType() { + return type; + } +} diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/item/ArmorType.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/item/ArmorType.java index a9ebb7eef..734d52e10 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/item/ArmorType.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/item/ArmorType.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.template.item; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/item/ItemMaterial.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/item/ItemMaterial.java index 358c8b522..69cd7f116 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/item/ItemMaterial.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/item/ItemMaterial.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.template.item; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/ItemTemplate.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/item/ItemTemplate.java similarity index 90% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/ItemTemplate.java rename to l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/item/ItemTemplate.java index cf8a1f80f..872d8ec88 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/ItemTemplate.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/item/ItemTemplate.java @@ -1,20 +1,20 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ -package com.l2jserver.model.template; +package com.l2jserver.model.template.item; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; @@ -29,11 +29,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.l2jserver.model.id.template.ItemTemplateID; +import com.l2jserver.model.template.AbstractTemplate; import com.l2jserver.model.template.calculator.ItemSetActorCalculator; -import com.l2jserver.model.template.item.ArmorType; -import com.l2jserver.model.template.item.ItemMaterial; -import com.l2jserver.model.template.item.ItemType; -import com.l2jserver.model.template.item.WeaponType; import com.l2jserver.model.world.Item; import com.l2jserver.model.world.actor.stat.StatType; import com.l2jserver.util.jaxb.ItemTemplateIDAdapter; @@ -46,7 +43,7 @@ import com.l2jserver.util.jaxb.ItemTemplateIDAdapter; @XmlRootElement(name = "item", namespace = "http://schemas.l2jserver2.com/item") @XmlType(namespace = "http://schemas.l2jserver2.com/item", name = "ItemType") @XmlAccessorType(XmlAccessType.FIELD) -public class ItemTemplate extends AbstractTemplate { +public class ItemTemplate extends AbstractTemplate { /** * The logger */ @@ -136,7 +133,11 @@ public class ItemTemplate extends AbstractTemplate { } } - @Override + /** + * Create a new {@link Item} + * + * @return the created object + */ public Item create() { log.debug("Creating a new Item instance with template {}", this); return new Item(id); diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/item/ItemType.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/item/ItemType.java index 678a2032c..a531595be 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/item/ItemType.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/item/ItemType.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.template.item; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/npc/NPCRace.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/npc/NPCRace.java index 0db7efc3d..b5ae50868 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/npc/NPCRace.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/npc/NPCRace.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.template.npc; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/NPCTemplate.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/npc/NPCTemplate.java similarity index 98% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/NPCTemplate.java rename to l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/npc/NPCTemplate.java index 92e327c82..22c576a04 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/NPCTemplate.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/npc/NPCTemplate.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General public License * along with l2jserver. If not, see . */ -package com.l2jserver.model.template; +package com.l2jserver.model.template.npc; import java.util.Collection; import java.util.List; @@ -33,9 +33,10 @@ import com.l2jserver.model.game.Skill; import com.l2jserver.model.id.template.ItemTemplateID; import com.l2jserver.model.id.template.NPCTemplateID; import com.l2jserver.model.id.template.SkillTemplateID; -import com.l2jserver.model.template.NPCTemplate.TalkMetadata.Chat; +import com.l2jserver.model.template.SkillTemplate; import com.l2jserver.model.template.actor.ActorSex; -import com.l2jserver.model.template.npc.NPCRace; +import com.l2jserver.model.template.actor.ActorTemplate; +import com.l2jserver.model.template.npc.NPCTemplate.TalkMetadata.Chat; import com.l2jserver.model.world.NPC; import com.l2jserver.model.world.npc.controller.NPCController; import com.l2jserver.util.factory.CollectionFactory; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/TeleportationTemplate.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/npc/TeleportationTemplate.java similarity index 85% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/TeleportationTemplate.java rename to l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/npc/TeleportationTemplate.java index ed2932751..2363eea9d 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/TeleportationTemplate.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/npc/TeleportationTemplate.java @@ -1,20 +1,20 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ -package com.l2jserver.model.template; +package com.l2jserver.model.template.npc; import java.util.List; @@ -29,6 +29,7 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import com.l2jserver.model.id.template.ItemTemplateID; import com.l2jserver.model.id.template.TeleportationTemplateID; +import com.l2jserver.model.template.AbstractTemplate; import com.l2jserver.util.geometry.Coordinate; import com.l2jserver.util.jaxb.CoordinateAdapter; import com.l2jserver.util.jaxb.ItemTemplateIDAdapter; @@ -42,7 +43,7 @@ import com.l2jserver.util.jaxb.TeleportationTemplateIDAdapter; @XmlRootElement(name = "teleport", namespace = "http://schemas.l2jserver2.com/teleport") @XmlAccessorType(XmlAccessType.FIELD) @XmlType(namespace = "http://schemas.l2jserver2.com/teleport", name = "TeleportType") -public class TeleportationTemplate extends AbstractTemplate { +public class TeleportationTemplate extends AbstractTemplate { @XmlAttribute(name = "id") @XmlJavaTypeAdapter(TeleportationTemplateIDAdapter.class) protected TeleportationTemplateID id; @@ -68,7 +69,11 @@ public class TeleportationTemplate extends AbstractTemplate { NOBLE; } - @Override + /** + * Create a new {@link Coordinate} + * + * @return the created object + */ public Coordinate create() { return coordinate; } diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/skill/SkillEffect.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/skill/SkillEffect.java deleted file mode 100644 index d041e9897..000000000 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/skill/SkillEffect.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * This file is part of l2jserver . - * - * l2jserver is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * l2jserver is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . - */ -package com.l2jserver.model.template.skill; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; - -/** - * @author Rogiel - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "Effect") -public abstract class SkillEffect { -} diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/skill/effect/BuffEffect.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/skill/effect/BuffEffect.java deleted file mode 100644 index 02a29e60c..000000000 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/skill/effect/BuffEffect.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * This file is part of l2jserver . - * - * l2jserver is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * l2jserver is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . - */ -package com.l2jserver.model.template.skill.effect; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlType; - -import com.l2jserver.model.template.skill.SkillEffect; - -/** - * @author Rogiel - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "TeleportEffect") -public class BuffEffect extends SkillEffect { - public enum SkillTeleportEffectLocation { - TARGET, OFFSET_FROM_TARGET, POINT; - } - - @XmlAttribute(name = "type", required = false) - protected SkillTeleportEffectLocation type = SkillTeleportEffectLocation.TARGET; - - - - /** - * @return the teleport effect type - */ - public SkillTeleportEffectLocation getType() { - return type; - } -} diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/skill/effect/TeleportEffect.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/skill/effect/TeleportEffect.java deleted file mode 100644 index 13cfb30dc..000000000 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/skill/effect/TeleportEffect.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * This file is part of l2jserver . - * - * l2jserver is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * l2jserver is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . - */ -package com.l2jserver.model.template.skill.effect; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlType; - -import com.l2jserver.model.template.skill.SkillEffect; - -/** - * @author Rogiel - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "TeleportEffect") -public class TeleportEffect extends SkillEffect { - public enum SkillTeleportEffectLocation { - TARGET, OFFSET_FROM_TARGET, POINT; - } - - @XmlAttribute(name = "type", required = false) - protected SkillTeleportEffectLocation type = SkillTeleportEffectLocation.TARGET; - - - - /** - * @return the teleport effect type - */ - public SkillTeleportEffectLocation getType() { - return type; - } -} diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/AbstractObject.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/AbstractObject.java index 525389b3e..1f788ee6e 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/AbstractObject.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/AbstractObject.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/Actor.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/Actor.java index 30615c792..5018b4463 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/Actor.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/Actor.java @@ -1,27 +1,27 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world; import com.l2jserver.model.id.TemplateID; import com.l2jserver.model.id.object.ActorID; import com.l2jserver.model.id.template.ActorTemplateID; -import com.l2jserver.model.template.ActorTemplate; import com.l2jserver.model.template.actor.ActorSex; -import com.l2jserver.model.world.actor.ActorEffects; +import com.l2jserver.model.template.actor.ActorTemplate; +import com.l2jserver.model.world.actor.ActorEffectContainer; import com.l2jserver.model.world.actor.ActorSkillContainer; import com.l2jserver.model.world.actor.stat.ActorStats; @@ -99,7 +99,7 @@ public abstract class Actor extends PositionableObject { /** * The currently effects active on the actor */ - protected final ActorEffects effects = new ActorEffects(this); + protected final ActorEffectContainer effects = new ActorEffectContainer(this); /** * The skills learned by this actor */ @@ -274,7 +274,7 @@ public abstract class Actor extends PositionableObject { /** * @return the active effects on this actor */ - public ActorEffects getEffects() { + public ActorEffectContainer getEffects() { return effects; } diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/Clan.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/Clan.java index 55c7d3df1..3dc305770 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/Clan.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/Clan.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/Item.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/Item.java index 5026eb39c..d0ade6f0a 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/Item.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/Item.java @@ -1,24 +1,24 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world; import com.l2jserver.model.id.object.CharacterID; import com.l2jserver.model.id.template.ItemTemplateID; -import com.l2jserver.model.template.ItemTemplate; +import com.l2jserver.model.template.item.ItemTemplate; import com.l2jserver.model.world.character.CharacterInventory.InventoryLocation; import com.l2jserver.model.world.character.CharacterInventory.InventoryPaperdoll; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/L2Character.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/L2Character.java index 951f1a3be..3bb1b95dc 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/L2Character.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/L2Character.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world; @@ -24,9 +24,9 @@ import com.l2jserver.model.id.object.CharacterID; import com.l2jserver.model.id.object.ClanID; import com.l2jserver.model.id.object.PetID; import com.l2jserver.model.id.template.CharacterTemplateID; -import com.l2jserver.model.template.CharacterTemplate; import com.l2jserver.model.template.character.CharacterClass; import com.l2jserver.model.template.character.CharacterRace; +import com.l2jserver.model.template.character.CharacterTemplate; import com.l2jserver.model.world.character.CharacterAppearance; import com.l2jserver.model.world.character.CharacterFriendList; import com.l2jserver.model.world.character.CharacterInventory; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/NPC.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/NPC.java index d9c4192b9..c0b42b286 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/NPC.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/NPC.java @@ -1,26 +1,26 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world; import com.l2jserver.model.id.TemplateID; import com.l2jserver.model.id.object.NPCID; import com.l2jserver.model.id.template.NPCTemplateID; -import com.l2jserver.model.template.NPCTemplate; import com.l2jserver.model.template.actor.ActorSex; +import com.l2jserver.model.template.npc.NPCTemplate; import com.l2jserver.model.world.npc.NPCStats; import com.l2jserver.service.game.ai.AIScript; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/Pet.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/Pet.java index ca69b89e7..b8a14fc4d 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/Pet.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/Pet.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/Player.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/Player.java index 5ae297b49..2cd3f3229 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/Player.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/Player.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/PositionableObject.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/PositionableObject.java index 053e01858..3d2b6396d 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/PositionableObject.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/PositionableObject.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/WorldObject.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/WorldObject.java index 0f9afb6d4..bf8d37ab0 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/WorldObject.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/WorldObject.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/ActorEffects.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/ActorEffectContainer.java similarity index 52% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/ActorEffects.java rename to l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/ActorEffectContainer.java index 11619ba72..5ac138f24 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/ActorEffects.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/ActorEffectContainer.java @@ -1,33 +1,42 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.actor; +import java.util.Iterator; +import java.util.Set; + import com.l2jserver.model.world.Actor; +import com.l2jserver.model.world.actor.effect.Effect; +import com.l2jserver.util.factory.CollectionFactory; /** * Class controlling active effects on an {@link Actor}. * * @author Rogiel */ -public class ActorEffects { +public class ActorEffectContainer implements Iterable { /** * The actor being affected by the effects */ private final Actor actor; + /** + * The list of all active effects + */ + private Set effects = CollectionFactory.newSet(); /** * Creates a new instance @@ -35,10 +44,23 @@ public class ActorEffects { * @param actor * the actor */ - public ActorEffects(Actor actor) { + public ActorEffectContainer(Actor actor) { this.actor = actor; } + public void addEffect(Effect effect) { + effects.add(effect); + } + + public void removeEffect(Effect effect) { + effects.remove(effect); + } + + @Override + public Iterator iterator() { + return effects.iterator(); + } + /** * @return the actor */ diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/ActorExperience.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/ActorExperience.java index c81a49bd5..e55439fef 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/ActorExperience.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/ActorExperience.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.actor; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/ActorSkillContainer.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/ActorSkillContainer.java index cb9f28b35..8a780569e 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/ActorSkillContainer.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/ActorSkillContainer.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.actor; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/ActorCalculator.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/ActorCalculator.java index 3b7739c36..fc48d9f37 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/ActorCalculator.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/ActorCalculator.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.actor.calculator; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/ActorCalculatorContext.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/ActorCalculatorContext.java index 5b8f07c20..3c00aceee 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/ActorCalculatorContext.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/ActorCalculatorContext.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.actor.calculator; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/ActorCalculatorFunction.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/ActorCalculatorFunction.java index 63c764400..d7b0e2aac 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/ActorCalculatorFunction.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/ActorCalculatorFunction.java @@ -1,22 +1,22 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.actor.calculator; -import com.l2jserver.model.template.ActorTemplate; +import com.l2jserver.model.template.actor.ActorTemplate; import com.l2jserver.model.world.Actor; import com.l2jserver.model.world.actor.stat.StatType; import com.l2jserver.util.calculator.AbstractDoubleFunction; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/ActorFormula.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/ActorFormula.java index af69d09f2..1dbce5881 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/ActorFormula.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/ActorFormula.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.actor.calculator; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/AttackAccuracyBonusCalculator.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/AttackAccuracyBonusCalculator.java index 57ec154a2..ef5d5bd3d 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/AttackAccuracyBonusCalculator.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/AttackAccuracyBonusCalculator.java @@ -1,24 +1,24 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.actor.calculator; import org.apache.commons.math.util.FastMath; -import com.l2jserver.model.template.ActorTemplate; +import com.l2jserver.model.template.actor.ActorTemplate; import com.l2jserver.model.world.Actor; import com.l2jserver.model.world.actor.stat.StatType; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/AttackEvasionBonusCalculator.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/AttackEvasionBonusCalculator.java index e05ae8fd4..53e334a15 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/AttackEvasionBonusCalculator.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/AttackEvasionBonusCalculator.java @@ -1,24 +1,24 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.actor.calculator; import org.apache.commons.math.util.FastMath; -import com.l2jserver.model.template.ActorTemplate; +import com.l2jserver.model.template.actor.ActorTemplate; import com.l2jserver.model.world.Actor; import com.l2jserver.model.world.actor.stat.StatType; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/MagicalAttackBonusCalculator.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/MagicalAttackBonusCalculator.java index cacc30fdb..9deed73ca 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/MagicalAttackBonusCalculator.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/MagicalAttackBonusCalculator.java @@ -1,22 +1,22 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.actor.calculator; -import com.l2jserver.model.template.ActorTemplate; +import com.l2jserver.model.template.actor.ActorTemplate; import com.l2jserver.model.world.Actor; import com.l2jserver.model.world.actor.stat.BaseStats; import com.l2jserver.model.world.actor.stat.StatType; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/MagicalAttackSpeedBonusCalculator.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/MagicalAttackSpeedBonusCalculator.java index 2b563e44b..1d3c847bd 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/MagicalAttackSpeedBonusCalculator.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/MagicalAttackSpeedBonusCalculator.java @@ -1,22 +1,22 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.actor.calculator; -import com.l2jserver.model.template.ActorTemplate; +import com.l2jserver.model.template.actor.ActorTemplate; import com.l2jserver.model.world.Actor; import com.l2jserver.model.world.actor.stat.BaseStats; import com.l2jserver.model.world.actor.stat.StatType; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/MagicalCriticalRateBonusCalculator.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/MagicalCriticalRateBonusCalculator.java index e37e0cf60..84272f2b0 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/MagicalCriticalRateBonusCalculator.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/MagicalCriticalRateBonusCalculator.java @@ -16,7 +16,7 @@ */ package com.l2jserver.model.world.actor.calculator; -import com.l2jserver.model.template.ActorTemplate; +import com.l2jserver.model.template.actor.ActorTemplate; import com.l2jserver.model.world.Actor; import com.l2jserver.model.world.actor.stat.BaseStats; import com.l2jserver.model.world.actor.stat.StatType; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/MagicalDefenseBonusCalculator.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/MagicalDefenseBonusCalculator.java index 033d67c20..a8bc64b00 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/MagicalDefenseBonusCalculator.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/MagicalDefenseBonusCalculator.java @@ -1,22 +1,22 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.actor.calculator; -import com.l2jserver.model.template.ActorTemplate; +import com.l2jserver.model.template.actor.ActorTemplate; import com.l2jserver.model.world.Actor; import com.l2jserver.model.world.actor.stat.BaseStats; import com.l2jserver.model.world.actor.stat.StatType; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/MaximumHPBonusCalculator.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/MaximumHPBonusCalculator.java index 04a4b2dac..eef6fd7ed 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/MaximumHPBonusCalculator.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/MaximumHPBonusCalculator.java @@ -1,22 +1,22 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.actor.calculator; -import com.l2jserver.model.template.ActorTemplate; +import com.l2jserver.model.template.actor.ActorTemplate; import com.l2jserver.model.world.Actor; import com.l2jserver.model.world.actor.stat.BaseStats; import com.l2jserver.model.world.actor.stat.StatType; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/MaximumMPBonusCalculator.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/MaximumMPBonusCalculator.java index bccb8fb93..de96d24d7 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/MaximumMPBonusCalculator.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/MaximumMPBonusCalculator.java @@ -1,22 +1,22 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.actor.calculator; -import com.l2jserver.model.template.ActorTemplate; +import com.l2jserver.model.template.actor.ActorTemplate; import com.l2jserver.model.world.Actor; import com.l2jserver.model.world.actor.stat.BaseStats; import com.l2jserver.model.world.actor.stat.StatType; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/PhysicalAttackBonusCalculator.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/PhysicalAttackBonusCalculator.java index 975de8c67..f066b06b8 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/PhysicalAttackBonusCalculator.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/PhysicalAttackBonusCalculator.java @@ -1,22 +1,22 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.actor.calculator; -import com.l2jserver.model.template.ActorTemplate; +import com.l2jserver.model.template.actor.ActorTemplate; import com.l2jserver.model.world.Actor; import com.l2jserver.model.world.actor.stat.BaseStats; import com.l2jserver.model.world.actor.stat.StatType; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/PhysicalAttackSpeedBonusCalculator.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/PhysicalAttackSpeedBonusCalculator.java index 99da83b3b..f8ca85409 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/PhysicalAttackSpeedBonusCalculator.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/PhysicalAttackSpeedBonusCalculator.java @@ -1,22 +1,22 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.actor.calculator; -import com.l2jserver.model.template.ActorTemplate; +import com.l2jserver.model.template.actor.ActorTemplate; import com.l2jserver.model.world.Actor; import com.l2jserver.model.world.actor.stat.BaseStats; import com.l2jserver.model.world.actor.stat.StatType; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/PhysicalCriticalRateBonusCalculator.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/PhysicalCriticalRateBonusCalculator.java index be7994f05..4f2f2ab51 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/PhysicalCriticalRateBonusCalculator.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/PhysicalCriticalRateBonusCalculator.java @@ -1,22 +1,22 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.actor.calculator; -import com.l2jserver.model.template.ActorTemplate; +import com.l2jserver.model.template.actor.ActorTemplate; import com.l2jserver.model.world.Actor; import com.l2jserver.model.world.actor.stat.BaseStats; import com.l2jserver.model.world.actor.stat.StatType; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/PhysicalDefenseBonusCalculator.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/PhysicalDefenseBonusCalculator.java index 5dd6ec0bf..6354a6048 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/PhysicalDefenseBonusCalculator.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/PhysicalDefenseBonusCalculator.java @@ -1,22 +1,22 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.actor.calculator; -import com.l2jserver.model.template.ActorTemplate; +import com.l2jserver.model.template.actor.ActorTemplate; import com.l2jserver.model.world.Actor; import com.l2jserver.model.world.actor.stat.StatType; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/RunSpeedBonusCalculator.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/RunSpeedBonusCalculator.java index b2fb11a97..cee802fd0 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/RunSpeedBonusCalculator.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/RunSpeedBonusCalculator.java @@ -1,22 +1,22 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.actor.calculator; -import com.l2jserver.model.template.ActorTemplate; +import com.l2jserver.model.template.actor.ActorTemplate; import com.l2jserver.model.world.Actor; import com.l2jserver.model.world.actor.stat.BaseStats; import com.l2jserver.model.world.actor.stat.StatType; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/WalkSpeedBonusCalculator.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/WalkSpeedBonusCalculator.java index 00b590a3d..3e589e60c 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/WalkSpeedBonusCalculator.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/WalkSpeedBonusCalculator.java @@ -1,22 +1,22 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.actor.calculator; -import com.l2jserver.model.template.ActorTemplate; +import com.l2jserver.model.template.actor.ActorTemplate; import com.l2jserver.model.world.Actor; import com.l2jserver.model.world.actor.stat.BaseStats; import com.l2jserver.model.world.actor.stat.StatType; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/effect/AbstractEffect.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/effect/AbstractEffect.java new file mode 100644 index 000000000..64f52035e --- /dev/null +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/effect/AbstractEffect.java @@ -0,0 +1,61 @@ +/* + * This file is part of l2jserver2 . + * + * l2jserver2 is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver2 is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver2. If not, see . + */ +package com.l2jserver.model.world.actor.effect; + +import com.l2jserver.model.id.object.ActorID; +import com.l2jserver.model.id.template.EffectTemplateID; +import com.l2jserver.model.template.effect.EffectTemplate; +import com.l2jserver.model.world.Actor; + +/** + * An simple {@link Effect} implementing basic methods. Effect implementations + * are encouraged to implement this class instead of {@link Effect} directly. + * + * @author Rogiel + * @param + * the effect template type + */ +public abstract class AbstractEffect implements + Effect { + protected final T template; + protected final Actor actor; + + public AbstractEffect(T template, Actor actor) { + this.template = template; + this.actor = actor; + } + + @Override + public EffectTemplateID getTemplateID() { + return template.getID(); + } + + @Override + public EffectTemplate getTemplate() { + return template; + } + + @Override + public ActorID getActorID() { + return actor.getID(); + } + + @Override + public Actor getActor() { + return actor; + } +} diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/effect/AbstractTemporalEffect.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/effect/AbstractTemporalEffect.java new file mode 100644 index 000000000..812af4bb0 --- /dev/null +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/effect/AbstractTemporalEffect.java @@ -0,0 +1,75 @@ +/* + * This file is part of l2jserver2 . + * + * l2jserver2 is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver2 is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver2. If not, see . + */ +package com.l2jserver.model.world.actor.effect; + +import com.l2jserver.model.template.effect.EffectTemplate; +import com.l2jserver.model.world.Actor; +import com.l2jserver.util.exception.L2Exception; + +/** + * An simple {@link TemporalEffect} implementing basic methods. Effect + * implementations are encouraged to implement this class instead of + * {@link TemporalEffect} directly. + * + * @author Rogiel + * @param + * the effect template type + */ +public abstract class AbstractTemporalEffect extends + AbstractEffect implements TemporalEffect { + protected long lastCallTime; + + public AbstractTemporalEffect(T template, Actor actor) { + super(template, actor); + } + + @Override + public final void applyEffect() throws L2Exception { + lastCallTime = System.currentTimeMillis(); + applyEffectImpl(); + } + + /** + * Applies the given effect to actor + * + * @throws L2Exception + * if any {@link L2Exception} occur + * @see TemporalEffect#applyEffect() + */ + public abstract void applyEffectImpl() throws L2Exception; + + @Override + public final TemporalEffectAction continueEffect() { + long now = System.currentTimeMillis(); + long delta = now - lastCallTime; + try { + return continueEffect(delta); + } finally { + lastCallTime = now; + } + } + + /** + * Continues the effect calculation, if necessary. + * + * @param elapsedTime + * the time elapsed since the last call + * @return the next action + * @see TemporalEffect#continueEffect() + */ + protected abstract TemporalEffectAction continueEffect(long elapsedTime); +} diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/effect/Effect.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/effect/Effect.java new file mode 100644 index 000000000..5d5849e68 --- /dev/null +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/effect/Effect.java @@ -0,0 +1,59 @@ +/* + * This file is part of l2jserver2 . + * + * l2jserver2 is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver2 is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver2. If not, see . + */ +package com.l2jserver.model.world.actor.effect; + +import com.l2jserver.model.id.ID; +import com.l2jserver.model.id.object.ActorID; +import com.l2jserver.model.id.template.EffectTemplateID; +import com.l2jserver.model.template.effect.EffectTemplate; +import com.l2jserver.model.world.Actor; +import com.l2jserver.util.exception.L2Exception; + +/** + * @author Rogiel + */ +public interface Effect { + /** + * Applies the given effect to actor + * + * @throws L2Exception + * if any {@link L2Exception} occur + */ + void applyEffect() throws L2Exception; + + /** + * @return this effect template id + */ + EffectTemplateID getTemplateID(); + + /** + * @return this effect template + */ + EffectTemplate getTemplate(); + + /** + * @return the actor {@link ID} to which this {@link Effect} is (or was or + * will be) applied to. + */ + ActorID getActorID(); + + /** + * @return the {@link Actor} to which this {@link Effect} is (or was or will + * be) applied to. + */ + Actor getActor(); +} diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/effect/TemporalEffect.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/effect/TemporalEffect.java new file mode 100644 index 000000000..b66c59f22 --- /dev/null +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/effect/TemporalEffect.java @@ -0,0 +1,47 @@ +/* + * This file is part of l2jserver2 . + * + * l2jserver2 is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver2 is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver2. If not, see . + */ +package com.l2jserver.model.world.actor.effect; + +import com.l2jserver.service.game.effect.EffectService; + +/** + * @author Rogiel + */ +public interface TemporalEffect extends Effect { + /** + * Continues the effect calculation, if necessary. + * + * @return the next action + */ + TemporalEffectAction continueEffect(); + + /** + * The result from {@link TemporalEffect#continueEffect()}, instructs the + * {@link EffectService} in what it should do next. + * + * @author Rogiel + */ + public enum TemporalEffectAction { + CANCEL; + } + + /** + * Ends the effect. Deattachs the actor from any service it may have been + * attached due to this effect and reverts actor back to normal state. + */ + void cancelEffect(); +} diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/event/ActorAttackHitEvent.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/event/ActorAttackHitEvent.java index b6f3ec55e..5725f705d 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/event/ActorAttackHitEvent.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/event/ActorAttackHitEvent.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.actor.event; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/event/ActorDieEvent.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/event/ActorDieEvent.java index ebcb72931..267a3b5e9 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/event/ActorDieEvent.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/event/ActorDieEvent.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.actor.event; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/event/ActorEvent.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/event/ActorEvent.java index 30684ebc7..2b2da8de9 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/event/ActorEvent.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/event/ActorEvent.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.actor.event; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/event/ActorListener.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/event/ActorListener.java index 40252bf08..dbb0b4eb6 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/event/ActorListener.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/event/ActorListener.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.actor.event; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/event/ActorSpawnEvent.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/event/ActorSpawnEvent.java index 646cde1c4..f3fc225ee 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/event/ActorSpawnEvent.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/event/ActorSpawnEvent.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.actor.event; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/player/event/PlayerTeleportingEvent.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/event/ActorTeleportingEvent.java similarity index 58% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/player/event/PlayerTeleportingEvent.java rename to l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/event/ActorTeleportingEvent.java index f5e26260c..c522f4691 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/player/event/PlayerTeleportingEvent.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/event/ActorTeleportingEvent.java @@ -1,38 +1,36 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ -package com.l2jserver.model.world.player.event; +package com.l2jserver.model.world.actor.event; import com.l2jserver.model.id.ObjectID; import com.l2jserver.model.world.Actor; -import com.l2jserver.model.world.Player; import com.l2jserver.model.world.WorldObject; import com.l2jserver.util.geometry.Point3D; /** - * Event dispatched once an player has started his teleported to another - * location + * Event dispatched once an actor has started his teleported to another location * * @author Rogiel */ -public class PlayerTeleportingEvent implements PlayerEvent { +public class ActorTeleportingEvent implements ActorEvent { /** - * The player object + * The actor object */ - private final Player player; + private final Actor actor; /** * The teleportation point */ @@ -41,29 +39,24 @@ public class PlayerTeleportingEvent implements PlayerEvent { /** * Creates a new instance * - * @param player - * the teleported player + * @param actor + * the teleported actor * @param point * the teleport point */ - public PlayerTeleportingEvent(Player player, Point3D point) { - this.player = player; + public ActorTeleportingEvent(Actor actor, Point3D point) { + this.actor = actor; this.point = point; } @Override public Actor getActor() { - return player; + return actor; } @Override public WorldObject getObject() { - return player; - } - - @Override - public Player getPlayer() { - return player; + return actor; } /** @@ -77,6 +70,6 @@ public class PlayerTeleportingEvent implements PlayerEvent { @Override public ObjectID[] getDispatchableObjects() { - return new ObjectID[] { player.getID() }; + return new ObjectID[] { actor.getID() }; } } diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/event/ActorUnspawnEvent.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/event/ActorUnspawnEvent.java index cdd7f1baa..52da2add8 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/event/ActorUnspawnEvent.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/event/ActorUnspawnEvent.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.actor.event; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/stat/ActorStats.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/stat/ActorStats.java index f02d2ae0e..dc080653b 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/stat/ActorStats.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/stat/ActorStats.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.actor.stat; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/stat/BaseStats.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/stat/BaseStats.java index 1786c6bdc..f5bb50cfb 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/stat/BaseStats.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/stat/BaseStats.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.actor.stat; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/CharacterAppearance.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/CharacterAppearance.java index f686f7cb6..1ea188c26 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/CharacterAppearance.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/CharacterAppearance.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.character; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/CharacterFriendList.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/CharacterFriendList.java index be8c23332..d3586bc61 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/CharacterFriendList.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/CharacterFriendList.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.character; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/CharacterInventory.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/CharacterInventory.java index 240c51a4c..2dc3d4a00 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/CharacterInventory.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/CharacterInventory.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.character; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/CharacterShortcutContainer.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/CharacterShortcutContainer.java index cefdbc418..dfa86fa9e 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/CharacterShortcutContainer.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/CharacterShortcutContainer.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.character; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/CharacterStats.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/CharacterStats.java index 5cc65a325..40dbb428d 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/CharacterStats.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/CharacterStats.java @@ -1,22 +1,22 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.character; -import com.l2jserver.model.template.ItemTemplate; +import com.l2jserver.model.template.item.ItemTemplate; import com.l2jserver.model.world.L2Character; import com.l2jserver.model.world.actor.calculator.ActorCalculator; import com.l2jserver.model.world.actor.stat.ActorStats; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/CharacterCalculator.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/CharacterCalculator.java index 3bb098fa3..6c0c06c16 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/CharacterCalculator.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/CharacterCalculator.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.character.calculator; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/CharacterCalculatorContext.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/CharacterCalculatorContext.java index 1689c8c5a..4b3d44918 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/CharacterCalculatorContext.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/CharacterCalculatorContext.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.character.calculator; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/CharacterCalculatorFunction.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/CharacterCalculatorFunction.java index 2029161f2..70d3e7eb1 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/CharacterCalculatorFunction.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/CharacterCalculatorFunction.java @@ -1,23 +1,23 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.character.calculator; -import com.l2jserver.model.template.ActorTemplate; -import com.l2jserver.model.template.CharacterTemplate; +import com.l2jserver.model.template.actor.ActorTemplate; +import com.l2jserver.model.template.character.CharacterTemplate; import com.l2jserver.model.world.Actor; import com.l2jserver.model.world.L2Character; import com.l2jserver.model.world.actor.calculator.ActorCalculatorFunction; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/CharacterFormula.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/CharacterFormula.java index 74d77cf03..c55ce58b7 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/CharacterFormula.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/CharacterFormula.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.character.calculator; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/MaximumCPAddCalculator.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/MaximumCPAddCalculator.java index 1a371f508..f4dfb08b6 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/MaximumCPAddCalculator.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/MaximumCPAddCalculator.java @@ -1,22 +1,22 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.character.calculator; -import com.l2jserver.model.template.CharacterTemplate; +import com.l2jserver.model.template.character.CharacterTemplate; import com.l2jserver.model.world.L2Character; import com.l2jserver.model.world.actor.stat.StatType; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/MaximumCPBonusCalculator.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/MaximumCPBonusCalculator.java index cc4b7da7c..d6e301545 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/MaximumCPBonusCalculator.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/MaximumCPBonusCalculator.java @@ -1,22 +1,22 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.character.calculator; -import com.l2jserver.model.template.CharacterTemplate; +import com.l2jserver.model.template.character.CharacterTemplate; import com.l2jserver.model.world.L2Character; import com.l2jserver.model.world.actor.stat.BaseStats; import com.l2jserver.model.world.actor.stat.StatType; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/MaximumHPAddCalculator.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/MaximumHPAddCalculator.java index 4735b4422..7ed2f4957 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/MaximumHPAddCalculator.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/MaximumHPAddCalculator.java @@ -1,22 +1,22 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.character.calculator; -import com.l2jserver.model.template.CharacterTemplate; +import com.l2jserver.model.template.character.CharacterTemplate; import com.l2jserver.model.world.L2Character; import com.l2jserver.model.world.actor.stat.StatType; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/MaximumMPAddCalculator.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/MaximumMPAddCalculator.java index f4b95009c..c2345572a 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/MaximumMPAddCalculator.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/MaximumMPAddCalculator.java @@ -1,22 +1,22 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.character.calculator; -import com.l2jserver.model.template.CharacterTemplate; +import com.l2jserver.model.template.character.CharacterTemplate; import com.l2jserver.model.world.L2Character; import com.l2jserver.model.world.actor.stat.StatType; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseAttackAccuracyCalculator.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseAttackAccuracyCalculator.java index c2bec4e05..a214e9aa5 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseAttackAccuracyCalculator.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseAttackAccuracyCalculator.java @@ -1,22 +1,22 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.character.calculator.base; -import com.l2jserver.model.template.CharacterTemplate; +import com.l2jserver.model.template.character.CharacterTemplate; import com.l2jserver.model.world.L2Character; import com.l2jserver.model.world.actor.stat.StatType; import com.l2jserver.model.world.character.calculator.CharacterFormula; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseAttackEvasionCalculator.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseAttackEvasionCalculator.java index c895c27c5..270cdebb2 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseAttackEvasionCalculator.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseAttackEvasionCalculator.java @@ -1,22 +1,22 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.character.calculator.base; -import com.l2jserver.model.template.CharacterTemplate; +import com.l2jserver.model.template.character.CharacterTemplate; import com.l2jserver.model.world.L2Character; import com.l2jserver.model.world.actor.stat.StatType; import com.l2jserver.model.world.character.calculator.CharacterFormula; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseCPCalculator.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseCPCalculator.java index c944788c3..3ec7c3189 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseCPCalculator.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseCPCalculator.java @@ -1,22 +1,22 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.character.calculator.base; -import com.l2jserver.model.template.CharacterTemplate; +import com.l2jserver.model.template.character.CharacterTemplate; import com.l2jserver.model.world.L2Character; import com.l2jserver.model.world.actor.stat.StatType; import com.l2jserver.model.world.character.calculator.CharacterFormula; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseConcentrationCalculator.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseConcentrationCalculator.java index 0d29cda23..192590828 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseConcentrationCalculator.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseConcentrationCalculator.java @@ -1,22 +1,22 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.character.calculator.base; -import com.l2jserver.model.template.CharacterTemplate; +import com.l2jserver.model.template.character.CharacterTemplate; import com.l2jserver.model.world.L2Character; import com.l2jserver.model.world.actor.stat.StatType; import com.l2jserver.model.world.character.calculator.CharacterFormula; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseDexterityCalculator.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseDexterityCalculator.java index 43c69b5f8..ea27a96bf 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseDexterityCalculator.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseDexterityCalculator.java @@ -1,22 +1,22 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.character.calculator.base; -import com.l2jserver.model.template.CharacterTemplate; +import com.l2jserver.model.template.character.CharacterTemplate; import com.l2jserver.model.world.L2Character; import com.l2jserver.model.world.actor.stat.StatType; import com.l2jserver.model.world.character.calculator.CharacterFormula; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseHPCalculator.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseHPCalculator.java index f024be7eb..e1bc0bd4b 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseHPCalculator.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseHPCalculator.java @@ -1,22 +1,22 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.character.calculator.base; -import com.l2jserver.model.template.CharacterTemplate; +import com.l2jserver.model.template.character.CharacterTemplate; import com.l2jserver.model.world.L2Character; import com.l2jserver.model.world.actor.stat.StatType; import com.l2jserver.model.world.character.calculator.CharacterFormula; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseIntelligenceCalculator.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseIntelligenceCalculator.java index 31ceaaa8a..ac218df92 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseIntelligenceCalculator.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseIntelligenceCalculator.java @@ -1,22 +1,22 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.character.calculator.base; -import com.l2jserver.model.template.CharacterTemplate; +import com.l2jserver.model.template.character.CharacterTemplate; import com.l2jserver.model.world.L2Character; import com.l2jserver.model.world.actor.stat.StatType; import com.l2jserver.model.world.character.calculator.CharacterFormula; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseMPCalculator.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseMPCalculator.java index 9fdb7e745..b3dd6c6d1 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseMPCalculator.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseMPCalculator.java @@ -1,22 +1,22 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.character.calculator.base; -import com.l2jserver.model.template.CharacterTemplate; +import com.l2jserver.model.template.character.CharacterTemplate; import com.l2jserver.model.world.L2Character; import com.l2jserver.model.world.actor.stat.StatType; import com.l2jserver.model.world.character.calculator.CharacterFormula; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseMagicalAttackCalculator.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseMagicalAttackCalculator.java index 436a1891a..4140937eb 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseMagicalAttackCalculator.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseMagicalAttackCalculator.java @@ -1,22 +1,22 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.character.calculator.base; -import com.l2jserver.model.template.CharacterTemplate; +import com.l2jserver.model.template.character.CharacterTemplate; import com.l2jserver.model.world.L2Character; import com.l2jserver.model.world.actor.stat.StatType; import com.l2jserver.model.world.character.calculator.CharacterFormula; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseMagicalAttackSpeedCalculator.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseMagicalAttackSpeedCalculator.java index 1d4a0584e..6d4686d45 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseMagicalAttackSpeedCalculator.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseMagicalAttackSpeedCalculator.java @@ -1,22 +1,22 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.character.calculator.base; -import com.l2jserver.model.template.CharacterTemplate; +import com.l2jserver.model.template.character.CharacterTemplate; import com.l2jserver.model.world.L2Character; import com.l2jserver.model.world.actor.stat.StatType; import com.l2jserver.model.world.character.calculator.CharacterFormula; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseMagicalCriticalRateCalculator.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseMagicalCriticalRateCalculator.java index 2cacc98c7..ca40dbf51 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseMagicalCriticalRateCalculator.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseMagicalCriticalRateCalculator.java @@ -1,22 +1,22 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.character.calculator.base; -import com.l2jserver.model.template.CharacterTemplate; +import com.l2jserver.model.template.character.CharacterTemplate; import com.l2jserver.model.world.L2Character; import com.l2jserver.model.world.actor.stat.StatType; import com.l2jserver.model.world.character.calculator.CharacterFormula; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseMagicalDefenseCalculator.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseMagicalDefenseCalculator.java index 77881b398..f4580696a 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseMagicalDefenseCalculator.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseMagicalDefenseCalculator.java @@ -1,22 +1,22 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.character.calculator.base; -import com.l2jserver.model.template.CharacterTemplate; +import com.l2jserver.model.template.character.CharacterTemplate; import com.l2jserver.model.world.L2Character; import com.l2jserver.model.world.actor.stat.StatType; import com.l2jserver.model.world.character.calculator.CharacterFormula; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseMentalityCalculator.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseMentalityCalculator.java index 1d0bb4fa3..75f1988a8 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseMentalityCalculator.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseMentalityCalculator.java @@ -1,22 +1,22 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.character.calculator.base; -import com.l2jserver.model.template.CharacterTemplate; +import com.l2jserver.model.template.character.CharacterTemplate; import com.l2jserver.model.world.L2Character; import com.l2jserver.model.world.actor.stat.StatType; import com.l2jserver.model.world.character.calculator.CharacterFormula; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBasePhysicalAttackCalculator.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBasePhysicalAttackCalculator.java index 71d7e37eb..c78a3768b 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBasePhysicalAttackCalculator.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBasePhysicalAttackCalculator.java @@ -1,22 +1,22 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.character.calculator.base; -import com.l2jserver.model.template.CharacterTemplate; +import com.l2jserver.model.template.character.CharacterTemplate; import com.l2jserver.model.world.L2Character; import com.l2jserver.model.world.actor.stat.StatType; import com.l2jserver.model.world.character.calculator.CharacterFormula; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBasePhysicalAttackSpeedCalculator.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBasePhysicalAttackSpeedCalculator.java index bc89d99d2..400d6de35 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBasePhysicalAttackSpeedCalculator.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBasePhysicalAttackSpeedCalculator.java @@ -1,22 +1,22 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.character.calculator.base; -import com.l2jserver.model.template.CharacterTemplate; +import com.l2jserver.model.template.character.CharacterTemplate; import com.l2jserver.model.world.L2Character; import com.l2jserver.model.world.actor.stat.StatType; import com.l2jserver.model.world.character.calculator.CharacterFormula; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBasePhysicalCriticalRateCalculator.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBasePhysicalCriticalRateCalculator.java index 01851585c..42985d70c 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBasePhysicalCriticalRateCalculator.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBasePhysicalCriticalRateCalculator.java @@ -1,22 +1,22 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.character.calculator.base; -import com.l2jserver.model.template.CharacterTemplate; +import com.l2jserver.model.template.character.CharacterTemplate; import com.l2jserver.model.world.L2Character; import com.l2jserver.model.world.actor.stat.StatType; import com.l2jserver.model.world.character.calculator.CharacterFormula; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBasePhysicalDefenseCalculator.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBasePhysicalDefenseCalculator.java index fa5e60869..192a55f54 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBasePhysicalDefenseCalculator.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBasePhysicalDefenseCalculator.java @@ -1,22 +1,22 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.character.calculator.base; -import com.l2jserver.model.template.CharacterTemplate; +import com.l2jserver.model.template.character.CharacterTemplate; import com.l2jserver.model.world.L2Character; import com.l2jserver.model.world.actor.stat.StatType; import com.l2jserver.model.world.character.calculator.CharacterFormula; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseRunSpeedCalculator.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseRunSpeedCalculator.java index 0f6bcf553..148cf9ba4 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseRunSpeedCalculator.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseRunSpeedCalculator.java @@ -1,22 +1,22 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.character.calculator.base; -import com.l2jserver.model.template.CharacterTemplate; +import com.l2jserver.model.template.character.CharacterTemplate; import com.l2jserver.model.world.L2Character; import com.l2jserver.model.world.actor.stat.StatType; import com.l2jserver.model.world.character.calculator.CharacterFormula; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseStrengthCalculator.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseStrengthCalculator.java index 1b8cba461..dd32d29fe 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseStrengthCalculator.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseStrengthCalculator.java @@ -1,22 +1,22 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.character.calculator.base; -import com.l2jserver.model.template.CharacterTemplate; +import com.l2jserver.model.template.character.CharacterTemplate; import com.l2jserver.model.world.L2Character; import com.l2jserver.model.world.actor.stat.StatType; import com.l2jserver.model.world.character.calculator.CharacterFormula; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseWalkSpeedCalculator.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseWalkSpeedCalculator.java index e4f2c57fb..31d165ea0 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseWalkSpeedCalculator.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseWalkSpeedCalculator.java @@ -1,22 +1,22 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.character.calculator.base; -import com.l2jserver.model.template.CharacterTemplate; +import com.l2jserver.model.template.character.CharacterTemplate; import com.l2jserver.model.world.L2Character; import com.l2jserver.model.world.actor.stat.StatType; import com.l2jserver.model.world.character.calculator.CharacterFormula; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseWitnessCalculator.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseWitnessCalculator.java index 4eeea6c52..7cc556c20 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseWitnessCalculator.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseWitnessCalculator.java @@ -1,22 +1,22 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.character.calculator.base; -import com.l2jserver.model.template.CharacterTemplate; +import com.l2jserver.model.template.character.CharacterTemplate; import com.l2jserver.model.world.L2Character; import com.l2jserver.model.world.actor.stat.StatType; import com.l2jserver.model.world.character.calculator.CharacterFormula; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/event/CharacterAttackEvent.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/event/CharacterAttackEvent.java index 871814d7a..aa62c1060 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/event/CharacterAttackEvent.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/event/CharacterAttackEvent.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.character.event; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/event/CharacterEnterWorldEvent.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/event/CharacterEnterWorldEvent.java index e85e36423..e0cc96bce 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/event/CharacterEnterWorldEvent.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/event/CharacterEnterWorldEvent.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.character.event; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/event/CharacterEvent.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/event/CharacterEvent.java index 1accc75dd..3507988a4 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/event/CharacterEvent.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/event/CharacterEvent.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.character.event; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/event/CharacterLeaveWorldEvent.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/event/CharacterLeaveWorldEvent.java index 615a012ae..44a339772 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/event/CharacterLeaveWorldEvent.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/event/CharacterLeaveWorldEvent.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.character.event; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/event/CharacterListener.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/event/CharacterListener.java index 168ac0c6e..df4535ab8 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/event/CharacterListener.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/event/CharacterListener.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.character.event; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/event/CharacterMoveEvent.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/event/CharacterMoveEvent.java index dfa073446..ad5496f66 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/event/CharacterMoveEvent.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/event/CharacterMoveEvent.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.character.event; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/event/CharacterRunningEvent.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/event/CharacterRunningEvent.java index 2d6df2fcb..965836646 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/event/CharacterRunningEvent.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/event/CharacterRunningEvent.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.character.event; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/event/CharacterStopMoveEvent.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/event/CharacterStopMoveEvent.java index 89d83ab13..27e4ace31 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/event/CharacterStopMoveEvent.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/event/CharacterStopMoveEvent.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.character.event; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/event/CharacterTargetDeselectedEvent.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/event/CharacterTargetDeselectedEvent.java index 57055c277..7ff5d7ce5 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/event/CharacterTargetDeselectedEvent.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/event/CharacterTargetDeselectedEvent.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.character.event; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/event/CharacterTargetSelectedEvent.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/event/CharacterTargetSelectedEvent.java index a56c330a3..3e8218850 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/event/CharacterTargetSelectedEvent.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/event/CharacterTargetSelectedEvent.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.character.event; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/event/CharacterWalkingEvent.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/event/CharacterWalkingEvent.java index 49c766856..2f0908f4c 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/event/CharacterWalkingEvent.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/event/CharacterWalkingEvent.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.character.event; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/clan/ClanEvent.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/clan/ClanEvent.java index 0528e37d4..c088d9bf8 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/clan/ClanEvent.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/clan/ClanEvent.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.clan; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/clan/ClanListener.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/clan/ClanListener.java index 65dd8bcd1..fec197f34 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/clan/ClanListener.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/clan/ClanListener.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.clan; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/clan/ClanMembers.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/clan/ClanMembers.java index a4e8a0e32..65e1702e7 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/clan/ClanMembers.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/clan/ClanMembers.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.clan; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/event/SpawnEvent.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/event/SpawnEvent.java index 892ea8efa..6b33c7854 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/event/SpawnEvent.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/event/SpawnEvent.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.event; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/event/UnspawnEvent.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/event/UnspawnEvent.java index f7aa215cb..c12508b06 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/event/UnspawnEvent.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/event/UnspawnEvent.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.event; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/item/ItemDropEvent.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/item/ItemDropEvent.java index 163cfa5e0..7b46b5774 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/item/ItemDropEvent.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/item/ItemDropEvent.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.item; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/item/ItemEvent.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/item/ItemEvent.java index d290c2b70..5d7b84da4 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/item/ItemEvent.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/item/ItemEvent.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.item; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/item/ItemListener.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/item/ItemListener.java index 307325c91..0cec7559b 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/item/ItemListener.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/item/ItemListener.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.item; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/NPCStats.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/NPCStats.java index aebf89ce8..355cb6055 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/NPCStats.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/NPCStats.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.npc; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/NPCCalculator.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/NPCCalculator.java index e8a3802af..ce412274b 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/NPCCalculator.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/NPCCalculator.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.npc.calculator; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/NPCCalculatorContext.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/NPCCalculatorContext.java index 3ae0740d3..45bf4fc58 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/NPCCalculatorContext.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/NPCCalculatorContext.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.npc.calculator; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/NPCCalculatorFunction.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/NPCCalculatorFunction.java index 0139d5460..85d823fe1 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/NPCCalculatorFunction.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/NPCCalculatorFunction.java @@ -1,24 +1,24 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.npc.calculator; -import com.l2jserver.model.template.ActorTemplate; -import com.l2jserver.model.template.NPCTemplate; import com.l2jserver.model.template.Template; +import com.l2jserver.model.template.actor.ActorTemplate; +import com.l2jserver.model.template.npc.NPCTemplate; import com.l2jserver.model.world.Actor; import com.l2jserver.model.world.NPC; import com.l2jserver.model.world.actor.calculator.ActorCalculatorFunction; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/NPCFormula.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/NPCFormula.java index 01cb13dd3..4ef134639 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/NPCFormula.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/NPCFormula.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.npc.calculator; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseAttackEvasionCalculator.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseAttackEvasionCalculator.java index 505552c23..ba47d47af 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseAttackEvasionCalculator.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseAttackEvasionCalculator.java @@ -1,22 +1,22 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.npc.calculator.base; -import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.template.npc.NPCTemplate; import com.l2jserver.model.world.NPC; import com.l2jserver.model.world.actor.stat.StatType; import com.l2jserver.model.world.npc.calculator.NPCFormula; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseConcentrationCalculator.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseConcentrationCalculator.java index df289d9e2..9614abd0d 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseConcentrationCalculator.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseConcentrationCalculator.java @@ -1,22 +1,22 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.npc.calculator.base; -import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.template.npc.NPCTemplate; import com.l2jserver.model.world.NPC; import com.l2jserver.model.world.actor.stat.StatType; import com.l2jserver.model.world.npc.calculator.NPCFormula; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseDexterityCalculator.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseDexterityCalculator.java index 3de341abf..f2544d523 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseDexterityCalculator.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseDexterityCalculator.java @@ -1,22 +1,22 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.npc.calculator.base; -import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.template.npc.NPCTemplate; import com.l2jserver.model.world.NPC; import com.l2jserver.model.world.actor.stat.StatType; import com.l2jserver.model.world.npc.calculator.NPCFormula; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseHPCalculator.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseHPCalculator.java index a6d2c9c5d..ca604d82e 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseHPCalculator.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseHPCalculator.java @@ -1,22 +1,22 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.npc.calculator.base; -import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.template.npc.NPCTemplate; import com.l2jserver.model.world.NPC; import com.l2jserver.model.world.actor.stat.StatType; import com.l2jserver.model.world.npc.calculator.NPCFormula; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseIntelligenceCalculator.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseIntelligenceCalculator.java index c6584fac0..9965068ef 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseIntelligenceCalculator.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseIntelligenceCalculator.java @@ -1,22 +1,22 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.npc.calculator.base; -import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.template.npc.NPCTemplate; import com.l2jserver.model.world.NPC; import com.l2jserver.model.world.actor.stat.StatType; import com.l2jserver.model.world.npc.calculator.NPCFormula; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseMPCalculator.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseMPCalculator.java index 34f4f8d14..b3c1b1f0f 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseMPCalculator.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseMPCalculator.java @@ -1,22 +1,22 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.npc.calculator.base; -import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.template.npc.NPCTemplate; import com.l2jserver.model.world.NPC; import com.l2jserver.model.world.actor.stat.StatType; import com.l2jserver.model.world.npc.calculator.NPCFormula; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseMagicalAttackCalculator.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseMagicalAttackCalculator.java index e77ddf8f6..e5c6ba510 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseMagicalAttackCalculator.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseMagicalAttackCalculator.java @@ -1,22 +1,22 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.npc.calculator.base; -import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.template.npc.NPCTemplate; import com.l2jserver.model.world.NPC; import com.l2jserver.model.world.actor.stat.StatType; import com.l2jserver.model.world.npc.calculator.NPCFormula; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseMagicalAttackSpeedCalculator.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseMagicalAttackSpeedCalculator.java index 194d7d84f..f01bf6114 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseMagicalAttackSpeedCalculator.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseMagicalAttackSpeedCalculator.java @@ -1,22 +1,22 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.npc.calculator.base; -import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.template.npc.NPCTemplate; import com.l2jserver.model.world.NPC; import com.l2jserver.model.world.actor.stat.StatType; import com.l2jserver.model.world.npc.calculator.NPCFormula; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseMagicalCriticalRateCalculator.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseMagicalCriticalRateCalculator.java index ced2b863e..47ae38d12 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseMagicalCriticalRateCalculator.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseMagicalCriticalRateCalculator.java @@ -1,22 +1,22 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.npc.calculator.base; -import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.template.npc.NPCTemplate; import com.l2jserver.model.world.NPC; import com.l2jserver.model.world.actor.stat.StatType; import com.l2jserver.model.world.npc.calculator.NPCFormula; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseMagicalDefenseCalculator.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseMagicalDefenseCalculator.java index 2c76a85df..8b145ee60 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseMagicalDefenseCalculator.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseMagicalDefenseCalculator.java @@ -1,22 +1,22 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.npc.calculator.base; -import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.template.npc.NPCTemplate; import com.l2jserver.model.world.NPC; import com.l2jserver.model.world.actor.stat.StatType; import com.l2jserver.model.world.npc.calculator.NPCFormula; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseMentalityCalculator.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseMentalityCalculator.java index 4c1c7f434..05aba29c3 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseMentalityCalculator.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseMentalityCalculator.java @@ -1,22 +1,22 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.npc.calculator.base; -import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.template.npc.NPCTemplate; import com.l2jserver.model.world.NPC; import com.l2jserver.model.world.actor.stat.StatType; import com.l2jserver.model.world.npc.calculator.NPCFormula; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBasePhysicalAttackCalculator.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBasePhysicalAttackCalculator.java index 3757c9545..74e7f425f 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBasePhysicalAttackCalculator.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBasePhysicalAttackCalculator.java @@ -1,22 +1,22 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.npc.calculator.base; -import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.template.npc.NPCTemplate; import com.l2jserver.model.world.NPC; import com.l2jserver.model.world.actor.stat.StatType; import com.l2jserver.model.world.npc.calculator.NPCFormula; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBasePhysicalAttackSpeedCalculator.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBasePhysicalAttackSpeedCalculator.java index a06b72683..d47fb9431 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBasePhysicalAttackSpeedCalculator.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBasePhysicalAttackSpeedCalculator.java @@ -1,22 +1,22 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.npc.calculator.base; -import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.template.npc.NPCTemplate; import com.l2jserver.model.world.NPC; import com.l2jserver.model.world.actor.stat.StatType; import com.l2jserver.model.world.npc.calculator.NPCFormula; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBasePhysicalCriticalRateCalculator.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBasePhysicalCriticalRateCalculator.java index f94410db4..f70d0ee6e 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBasePhysicalCriticalRateCalculator.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBasePhysicalCriticalRateCalculator.java @@ -1,22 +1,22 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.npc.calculator.base; -import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.template.npc.NPCTemplate; import com.l2jserver.model.world.NPC; import com.l2jserver.model.world.actor.stat.StatType; import com.l2jserver.model.world.npc.calculator.NPCFormula; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBasePhysicalDefenseCalculator.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBasePhysicalDefenseCalculator.java index 39c01fc7e..bb3270826 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBasePhysicalDefenseCalculator.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBasePhysicalDefenseCalculator.java @@ -1,22 +1,22 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.npc.calculator.base; -import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.template.npc.NPCTemplate; import com.l2jserver.model.world.NPC; import com.l2jserver.model.world.actor.stat.StatType; import com.l2jserver.model.world.npc.calculator.NPCFormula; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseRunSpeedCalculator.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseRunSpeedCalculator.java index 08416e43a..c0f966470 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseRunSpeedCalculator.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseRunSpeedCalculator.java @@ -1,22 +1,22 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.npc.calculator.base; -import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.template.npc.NPCTemplate; import com.l2jserver.model.world.NPC; import com.l2jserver.model.world.actor.stat.StatType; import com.l2jserver.model.world.npc.calculator.NPCFormula; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseStrengthCalculator.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseStrengthCalculator.java index 784e448e0..380dd2bd2 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseStrengthCalculator.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseStrengthCalculator.java @@ -1,22 +1,22 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.npc.calculator.base; -import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.template.npc.NPCTemplate; import com.l2jserver.model.world.NPC; import com.l2jserver.model.world.actor.stat.StatType; import com.l2jserver.model.world.npc.calculator.NPCFormula; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseWalkSpeedCalculator.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseWalkSpeedCalculator.java index 3d07b4c0c..93a005a8a 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseWalkSpeedCalculator.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseWalkSpeedCalculator.java @@ -1,22 +1,22 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.npc.calculator.base; -import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.template.npc.NPCTemplate; import com.l2jserver.model.world.NPC; import com.l2jserver.model.world.actor.stat.StatType; import com.l2jserver.model.world.npc.calculator.NPCFormula; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseWitnessCalculator.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseWitnessCalculator.java index 9f9e2b775..ab00df27c 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseWitnessCalculator.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseWitnessCalculator.java @@ -1,22 +1,22 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.npc.calculator.base; -import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.template.npc.NPCTemplate; import com.l2jserver.model.world.NPC; import com.l2jserver.model.world.actor.stat.StatType; import com.l2jserver.model.world.npc.calculator.NPCFormula; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/controller/BaseNPCController.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/controller/BaseNPCController.java index 2f104fe2b..a54c29294 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/controller/BaseNPCController.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/controller/BaseNPCController.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.npc.controller; @@ -23,7 +23,7 @@ import org.htmlparser.util.ParserException; import com.l2jserver.game.net.Lineage2Client; import com.l2jserver.game.net.packet.server.SM_HTML; -import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.template.npc.NPCTemplate; import com.l2jserver.model.world.L2Character; import com.l2jserver.model.world.NPC; import com.l2jserver.util.exception.L2Exception; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/controller/MonsterController.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/controller/MonsterController.java index 1a9e849e5..3a8178fd0 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/controller/MonsterController.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/controller/MonsterController.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.npc.controller; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/controller/NPCController.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/controller/NPCController.java index c3cafc572..4d07307f5 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/controller/NPCController.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/controller/NPCController.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.npc.controller; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/controller/NotImplementedNPCController.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/controller/NotImplementedNPCController.java index c81be0d8a..5365c0571 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/controller/NotImplementedNPCController.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/controller/NotImplementedNPCController.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.npc.controller; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/controller/TeleporterController.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/controller/TeleporterController.java index 1cae60d73..691f7acce 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/controller/TeleporterController.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/controller/TeleporterController.java @@ -1,25 +1,25 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.npc.controller; import com.google.inject.Inject; import com.l2jserver.game.net.Lineage2Client; import com.l2jserver.model.id.template.provider.TeleportationTemplateIDProvider; -import com.l2jserver.model.template.TeleportationTemplate; +import com.l2jserver.model.template.npc.TeleportationTemplate; import com.l2jserver.model.world.L2Character; import com.l2jserver.model.world.NPC; import com.l2jserver.service.game.spawn.SpawnService; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/event/NPCDieEvent.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/event/NPCDieEvent.java index 16962e13f..d0ab88565 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/event/NPCDieEvent.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/event/NPCDieEvent.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.npc.event; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/event/NPCEvent.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/event/NPCEvent.java index dca0044a0..623ac6f21 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/event/NPCEvent.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/event/NPCEvent.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.npc.event; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/event/NPCListener.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/event/NPCListener.java index 265b94395..8d442c855 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/event/NPCListener.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/event/NPCListener.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.npc.event; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/event/NPCSpawnEvent.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/event/NPCSpawnEvent.java index 9cc5c6914..5f76e6b0b 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/event/NPCSpawnEvent.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/event/NPCSpawnEvent.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.npc.event; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/event/NPCUnspawnEvent.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/event/NPCUnspawnEvent.java index 77bb5e545..aca4527dd 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/event/NPCUnspawnEvent.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/event/NPCUnspawnEvent.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.npc.event; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/player/event/PlayerEvent.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/player/event/PlayerEvent.java index d82fb6ca9..8a374fa17 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/player/event/PlayerEvent.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/player/event/PlayerEvent.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.player.event; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/player/event/PlayerListener.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/player/event/PlayerListener.java index 53ad596c7..0020fb086 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/player/event/PlayerListener.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/player/event/PlayerListener.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.player.event; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/player/event/PlayerSpawnEvent.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/player/event/PlayerSpawnEvent.java index bca7ebd66..9cad7c016 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/player/event/PlayerSpawnEvent.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/player/event/PlayerSpawnEvent.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.player.event; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/player/event/PlayerTeleportedEvent.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/player/event/PlayerTeleportedEvent.java index 001adb8f1..ea92ab10a 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/player/event/PlayerTeleportedEvent.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/player/event/PlayerTeleportedEvent.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.world.player.event; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/ServiceModule.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/ServiceModule.java index 9557969f0..938588661 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/ServiceModule.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/ServiceModule.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/DerbyDAOModule.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/DerbyDAOModule.java index b279e6540..199cc56ef 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/DerbyDAOModule.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/DerbyDAOModule.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.database; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/GameServerDAOResolver.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/GameServerDAOResolver.java index 38e447175..8ee97dcff 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/GameServerDAOResolver.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/GameServerDAOResolver.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.database; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/GameServerJDBCDatabaseService.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/GameServerJDBCDatabaseService.java index e1c23916d..6f14a2dc6 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/GameServerJDBCDatabaseService.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/GameServerJDBCDatabaseService.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.database; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/GameServerOrientDatabaseService.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/GameServerOrientDatabaseService.java index c52e5a198..a93ea347b 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/GameServerOrientDatabaseService.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/GameServerOrientDatabaseService.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.database; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/H2DAOModule.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/H2DAOModule.java index b0cbdf754..babb45012 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/H2DAOModule.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/H2DAOModule.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.database; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/MySQL5DAOModule.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/MySQL5DAOModule.java index 1bb4c2b1b..14458a195 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/MySQL5DAOModule.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/MySQL5DAOModule.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.database; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/OrientDBDAOModule.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/OrientDBDAOModule.java index b2c792f3b..d79b38f1d 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/OrientDBDAOModule.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/OrientDBDAOModule.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.database; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/JDBCCharacterDAO.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/JDBCCharacterDAO.java index d1f4bce68..75dd4234b 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/JDBCCharacterDAO.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/JDBCCharacterDAO.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.database.jdbc; @@ -32,10 +32,10 @@ import com.l2jserver.model.id.object.provider.ClanIDProvider; import com.l2jserver.model.id.provider.AccountIDProvider; import com.l2jserver.model.id.template.CharacterTemplateID; import com.l2jserver.model.id.template.provider.CharacterTemplateIDProvider; -import com.l2jserver.model.template.CharacterTemplate; import com.l2jserver.model.template.actor.ActorSex; import com.l2jserver.model.template.character.CharacterClass; import com.l2jserver.model.template.character.CharacterRace; +import com.l2jserver.model.template.character.CharacterTemplate; import com.l2jserver.model.world.Clan; import com.l2jserver.model.world.L2Character; import com.l2jserver.model.world.character.CharacterAppearance; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/JDBCCharacterFriendDAO.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/JDBCCharacterFriendDAO.java index e878124c4..d37f01ee5 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/JDBCCharacterFriendDAO.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/JDBCCharacterFriendDAO.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.database.jdbc; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/JDBCChatMessageDAO.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/JDBCChatMessageDAO.java index f1d19c965..5ef890917 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/JDBCChatMessageDAO.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/JDBCChatMessageDAO.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.database.jdbc; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/JDBCClanDAO.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/JDBCClanDAO.java index a67dac1ef..be8bcd7d0 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/JDBCClanDAO.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/JDBCClanDAO.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.database.jdbc; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/JDBCItemDAO.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/JDBCItemDAO.java index 923ba2b91..3eb3f3784 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/JDBCItemDAO.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/JDBCItemDAO.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.database.jdbc; @@ -29,7 +29,7 @@ import com.l2jserver.model.id.object.provider.CharacterIDProvider; import com.l2jserver.model.id.object.provider.ItemIDProvider; import com.l2jserver.model.id.template.ItemTemplateID; import com.l2jserver.model.id.template.provider.ItemTemplateIDProvider; -import com.l2jserver.model.template.ItemTemplate; +import com.l2jserver.model.template.item.ItemTemplate; import com.l2jserver.model.world.Item; import com.l2jserver.model.world.L2Character; import com.l2jserver.model.world.character.CharacterInventory; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/JDBCNPCDAO.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/JDBCNPCDAO.java index f51c39548..5d049697c 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/JDBCNPCDAO.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/JDBCNPCDAO.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.database.jdbc; @@ -31,7 +31,7 @@ import com.l2jserver.model.id.object.NPCID; import com.l2jserver.model.id.object.provider.NPCIDProvider; import com.l2jserver.model.id.template.NPCTemplateID; import com.l2jserver.model.id.template.provider.NPCTemplateIDProvider; -import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.template.npc.NPCTemplate; import com.l2jserver.model.world.NPC; import com.l2jserver.service.database.AbstractJDBCDatabaseService.CachedMapper; import com.l2jserver.service.database.AbstractJDBCDatabaseService.InsertUpdateQuery; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/derby/DerbyCharacterDAO.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/derby/DerbyCharacterDAO.java index 83e650afb..ceda5f974 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/derby/DerbyCharacterDAO.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/derby/DerbyCharacterDAO.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.database.jdbc.derby; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/derby/DerbyCharacterFriendDAO.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/derby/DerbyCharacterFriendDAO.java index f4225b123..46be85c1b 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/derby/DerbyCharacterFriendDAO.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/derby/DerbyCharacterFriendDAO.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.database.jdbc.derby; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/derby/DerbyChatMessageDAO.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/derby/DerbyChatMessageDAO.java index 9ed9a3544..46a180fdd 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/derby/DerbyChatMessageDAO.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/derby/DerbyChatMessageDAO.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.database.jdbc.derby; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/derby/DerbyClanDAO.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/derby/DerbyClanDAO.java index 486e492eb..009b1d2fc 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/derby/DerbyClanDAO.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/derby/DerbyClanDAO.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.database.jdbc.derby; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/derby/DerbyItemDAO.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/derby/DerbyItemDAO.java index 07ad55c26..925328244 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/derby/DerbyItemDAO.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/derby/DerbyItemDAO.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.database.jdbc.derby; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/derby/DerbyNPCDAO.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/derby/DerbyNPCDAO.java index 977198bac..62985c4db 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/derby/DerbyNPCDAO.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/derby/DerbyNPCDAO.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.database.jdbc.derby; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/h2/H2CharacterDAO.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/h2/H2CharacterDAO.java index a6708213a..5148cee47 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/h2/H2CharacterDAO.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/h2/H2CharacterDAO.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.database.jdbc.h2; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/h2/H2CharacterFriendDAO.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/h2/H2CharacterFriendDAO.java index 19ce8c48c..c48d54347 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/h2/H2CharacterFriendDAO.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/h2/H2CharacterFriendDAO.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.database.jdbc.h2; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/h2/H2ChatMessageDAO.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/h2/H2ChatMessageDAO.java index 3e6a32c63..cb588a39b 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/h2/H2ChatMessageDAO.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/h2/H2ChatMessageDAO.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.database.jdbc.h2; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/h2/H2ClanDAO.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/h2/H2ClanDAO.java index ce2d01246..e0e13f35d 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/h2/H2ClanDAO.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/h2/H2ClanDAO.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.database.jdbc.h2; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/h2/H2ItemDAO.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/h2/H2ItemDAO.java index ecb83abac..215ce4e70 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/h2/H2ItemDAO.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/h2/H2ItemDAO.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.database.jdbc.h2; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/h2/H2NPCDAO.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/h2/H2NPCDAO.java index cf0656ecf..04458bbd1 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/h2/H2NPCDAO.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/h2/H2NPCDAO.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.database.jdbc.h2; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/mysql5/MySQL5CharacterDAO.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/mysql5/MySQL5CharacterDAO.java index 8aa04a95e..85425948a 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/mysql5/MySQL5CharacterDAO.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/mysql5/MySQL5CharacterDAO.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.database.jdbc.mysql5; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/mysql5/MySQL5CharacterFriendDAO.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/mysql5/MySQL5CharacterFriendDAO.java index d464e71c3..6725647cb 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/mysql5/MySQL5CharacterFriendDAO.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/mysql5/MySQL5CharacterFriendDAO.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.database.jdbc.mysql5; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/mysql5/MySQL5ChatMessageDAO.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/mysql5/MySQL5ChatMessageDAO.java index 4dfe3edf0..e83d8e766 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/mysql5/MySQL5ChatMessageDAO.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/mysql5/MySQL5ChatMessageDAO.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.database.jdbc.mysql5; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/mysql5/MySQL5ClanDAO.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/mysql5/MySQL5ClanDAO.java index e5e1d48eb..0f78dce59 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/mysql5/MySQL5ClanDAO.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/mysql5/MySQL5ClanDAO.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.database.jdbc.mysql5; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/mysql5/MySQL5ItemDAO.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/mysql5/MySQL5ItemDAO.java index 5bddd63d2..600b687d1 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/mysql5/MySQL5ItemDAO.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/mysql5/MySQL5ItemDAO.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.database.jdbc.mysql5; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/mysql5/MySQL5NPCDAO.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/mysql5/MySQL5NPCDAO.java index 534e4f24d..62eef0732 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/mysql5/MySQL5NPCDAO.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/jdbc/mysql5/MySQL5NPCDAO.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.database.jdbc.mysql5; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/orientdb/OrientDBCharacterDAO.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/orientdb/OrientDBCharacterDAO.java index 701514500..2cdefd866 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/orientdb/OrientDBCharacterDAO.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/orientdb/OrientDBCharacterDAO.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.database.orientdb; @@ -30,10 +30,10 @@ import com.l2jserver.model.id.object.provider.ClanIDProvider; import com.l2jserver.model.id.provider.AccountIDProvider; import com.l2jserver.model.id.template.CharacterTemplateID; import com.l2jserver.model.id.template.provider.CharacterTemplateIDProvider; -import com.l2jserver.model.template.CharacterTemplate; import com.l2jserver.model.template.actor.ActorSex; import com.l2jserver.model.template.character.CharacterClass; import com.l2jserver.model.template.character.CharacterRace; +import com.l2jserver.model.template.character.CharacterTemplate; import com.l2jserver.model.world.Clan; import com.l2jserver.model.world.L2Character; import com.l2jserver.model.world.character.CharacterAppearance; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/orientdb/OrientDBCharacterFriendDAO.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/orientdb/OrientDBCharacterFriendDAO.java index 7d9efd1db..9f12d254d 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/orientdb/OrientDBCharacterFriendDAO.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/orientdb/OrientDBCharacterFriendDAO.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.database.orientdb; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/orientdb/OrientDBChatMessageDAO.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/orientdb/OrientDBChatMessageDAO.java index 6c6639e24..1eb0ebc93 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/orientdb/OrientDBChatMessageDAO.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/orientdb/OrientDBChatMessageDAO.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.database.orientdb; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/AttackService.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/AttackService.java index c38cc9b4d..8e9e138a7 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/AttackService.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/AttackService.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/AttackServiceImpl.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/AttackServiceImpl.java index fe6505dd0..3da47fd02 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/AttackServiceImpl.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/AttackServiceImpl.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/DuelService.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/DuelService.java index 0e9686e58..ad3858fe6 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/DuelService.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/DuelService.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/DuelServiceImpl.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/DuelServiceImpl.java index af837d694..4a2fa16a2 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/DuelServiceImpl.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/DuelServiceImpl.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/GameTimeService.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/GameTimeService.java index 5b1770b33..8326422b8 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/GameTimeService.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/GameTimeService.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/GameTimeServiceImpl.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/GameTimeServiceImpl.java index c1112d5ab..918921714 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/GameTimeServiceImpl.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/GameTimeServiceImpl.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/LotteryService.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/LotteryService.java index 3edcd3250..5be0cffa4 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/LotteryService.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/LotteryService.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/PKService.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/PKService.java index b62cdf507..a6045c224 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/PKService.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/PKService.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/PvPService.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/PvPService.java index f4e539ef7..e7784ded9 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/PvPService.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/PvPService.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/admin/AdministratorService.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/admin/AdministratorService.java index 0b0641a61..606d26e51 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/admin/AdministratorService.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/admin/AdministratorService.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.admin; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/admin/AdministratorServiceImpl.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/admin/AdministratorServiceImpl.java index c8cab7417..295031173 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/admin/AdministratorServiceImpl.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/admin/AdministratorServiceImpl.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.admin; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/admin/GMService.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/admin/GMService.java index 0313b777d..cdc356885 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/admin/GMService.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/admin/GMService.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.admin; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/admin/panel/AdminHomeTemplate.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/admin/panel/AdminHomeTemplate.java index c7700e66b..cb46e46bb 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/admin/panel/AdminHomeTemplate.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/admin/panel/AdminHomeTemplate.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.admin.panel; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/admin/panel/TeleportTemplate.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/admin/panel/TeleportTemplate.java index e340d7503..4ee266656 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/admin/panel/TeleportTemplate.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/admin/panel/TeleportTemplate.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.admin.panel; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/ai/AIScript.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/ai/AIScript.java index ff7bca58a..f8c08dcbd 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/ai/AIScript.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/ai/AIScript.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.ai; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/ai/AIService.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/ai/AIService.java index 3adaf9c66..d6e3f2332 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/ai/AIService.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/ai/AIService.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.ai; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/ai/AIServiceImpl.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/ai/AIServiceImpl.java index f0ad3edf0..3a0456436 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/ai/AIServiceImpl.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/ai/AIServiceImpl.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.ai; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/castle/CastleService.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/castle/CastleService.java index 0abe04110..f8a47a0ba 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/castle/CastleService.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/castle/CastleService.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.castle; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/castle/SiegeService.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/castle/SiegeService.java index 3a29df53d..7839a8044 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/castle/SiegeService.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/castle/SiegeService.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.castle; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/ActorIsNotAttackableServiceException.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/ActorIsNotAttackableServiceException.java index 755c5e94f..0fbc0d14f 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/ActorIsNotAttackableServiceException.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/ActorIsNotAttackableServiceException.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.character; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/CannotSetTargetServiceException.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/CannotSetTargetServiceException.java index ad6eab09e..f8c742b82 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/CannotSetTargetServiceException.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/CannotSetTargetServiceException.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.character; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/CharacterAlreadyRunningServiceException.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/CharacterAlreadyRunningServiceException.java index a67bb6bff..5df8ca392 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/CharacterAlreadyRunningServiceException.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/CharacterAlreadyRunningServiceException.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.character; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/CharacterAlreadyWalkingServiceException.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/CharacterAlreadyWalkingServiceException.java index badaed82e..18ec6d058 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/CharacterAlreadyWalkingServiceException.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/CharacterAlreadyWalkingServiceException.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.character; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/CharacterInJailServiceException.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/CharacterInJailServiceException.java index ac912b849..602f1551e 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/CharacterInJailServiceException.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/CharacterInJailServiceException.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.character; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/CharacterInvalidAppearanceException.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/CharacterInvalidAppearanceException.java index ade488b8e..0dc8742ae 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/CharacterInvalidAppearanceException.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/CharacterInvalidAppearanceException.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.character; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/CharacterInvalidNameException.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/CharacterInvalidNameException.java index 6c2d96778..565d39d35 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/CharacterInvalidNameException.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/CharacterInvalidNameException.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.character; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/CharacterNameAlreadyExistsException.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/CharacterNameAlreadyExistsException.java index a8a423d76..7c5dfa547 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/CharacterNameAlreadyExistsException.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/CharacterNameAlreadyExistsException.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.character; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/CharacterNotInJailServiceException.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/CharacterNotInJailServiceException.java index 001c6e180..67716ae3e 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/CharacterNotInJailServiceException.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/CharacterNotInJailServiceException.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.character; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/CharacterService.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/CharacterService.java index c491464e9..dab2877cd 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/CharacterService.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/CharacterService.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.character; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/CharacterServiceException.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/CharacterServiceException.java index e5338ac8a..62f6ef175 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/CharacterServiceException.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/CharacterServiceException.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.character; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/CharacterServiceImpl.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/CharacterServiceImpl.java index a780c31eb..14d2681e4 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/CharacterServiceImpl.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/CharacterServiceImpl.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.character; @@ -38,9 +38,9 @@ import com.l2jserver.model.id.object.provider.CharacterIDProvider; import com.l2jserver.model.id.template.CharacterTemplateID; import com.l2jserver.model.id.template.provider.CharacterTemplateIDProvider; import com.l2jserver.model.server.ChatMessage; -import com.l2jserver.model.template.CharacterTemplate; import com.l2jserver.model.template.actor.ActorSex; import com.l2jserver.model.template.character.CharacterClass; +import com.l2jserver.model.template.character.CharacterTemplate; import com.l2jserver.model.world.Actor; import com.l2jserver.model.world.Actor.ActorState; import com.l2jserver.model.world.L2Character; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/CannotChatToSelfChatServiceException.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/CannotChatToSelfChatServiceException.java index de1e4a602..b2349c699 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/CannotChatToSelfChatServiceException.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/CannotChatToSelfChatServiceException.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.chat; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/ChatBanActiveChatServiceException.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/ChatBanActiveChatServiceException.java index 422f18d46..d79a3b03b 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/ChatBanActiveChatServiceException.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/ChatBanActiveChatServiceException.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.chat; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/ChatChannel.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/ChatChannel.java index 16ee7e5f3..97230a599 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/ChatChannel.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/ChatChannel.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.chat; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/ChatChannelFilter.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/ChatChannelFilter.java index 618f325fa..afadc73a8 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/ChatChannelFilter.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/ChatChannelFilter.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.chat; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/ChatChannelListener.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/ChatChannelListener.java index b2a9e1735..e7b66b0ab 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/ChatChannelListener.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/ChatChannelListener.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.chat; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/ChatLoggingService.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/ChatLoggingService.java index c270b1f5c..eb2ca6a6a 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/ChatLoggingService.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/ChatLoggingService.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.chat; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/ChatMessageType.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/ChatMessageType.java index 64cc6a31e..eaa0a2eb8 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/ChatMessageType.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/ChatMessageType.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.chat; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/ChatService.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/ChatService.java index 84291a64b..54bbff8f3 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/ChatService.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/ChatService.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.chat; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/ChatServiceException.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/ChatServiceException.java index 3071693b5..52586726a 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/ChatServiceException.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/ChatServiceException.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.chat; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/ChatTargetOfflineServiceException.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/ChatTargetOfflineServiceException.java index d51aaac8a..42eb5ad40 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/ChatTargetOfflineServiceException.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/ChatTargetOfflineServiceException.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.chat; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/DatabaseChatLoggingService.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/DatabaseChatLoggingService.java index 51f924835..02c6dba9e 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/DatabaseChatLoggingService.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/DatabaseChatLoggingService.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.chat; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/PrivateChatChannel.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/PrivateChatChannel.java index 7b26c33e2..53d4312b8 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/PrivateChatChannel.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/PrivateChatChannel.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.chat; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/PublicChatChannel.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/PublicChatChannel.java index f1fa510ec..4418b956e 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/PublicChatChannel.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/PublicChatChannel.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.chat; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/SimpleChatService.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/SimpleChatService.java index 96702ba12..a4f4ac857 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/SimpleChatService.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/SimpleChatService.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.chat; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/TargetNotFoundChatServiceException.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/TargetNotFoundChatServiceException.java index d967b8c05..62664eb31 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/TargetNotFoundChatServiceException.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/TargetNotFoundChatServiceException.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.chat; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/clan/ClanService.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/clan/ClanService.java index e6dbc6389..03b123a4e 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/clan/ClanService.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/clan/ClanService.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.clan; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/clan/FortService.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/clan/FortService.java index d5fa8e076..4cf30c8b8 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/clan/FortService.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/clan/FortService.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.clan; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/effect/EffectService.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/effect/EffectService.java index 86c920fbd..40dc2a52a 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/effect/EffectService.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/effect/EffectService.java @@ -1,23 +1,26 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.effect; -import com.l2jserver.model.world.L2Character; +import com.l2jserver.model.template.effect.EffectTemplate; +import com.l2jserver.model.world.Actor; +import com.l2jserver.model.world.actor.effect.Effect; import com.l2jserver.service.Service; +import com.l2jserver.util.exception.L2Exception; /** * The effect service will handle. This service will be backed by a thread that @@ -27,13 +30,33 @@ import com.l2jserver.service.Service; */ public interface EffectService extends Service { /** - * Adds a new effect to an given character. The effect will last - * duration milliseconds. + * Adds a new effect to an given character. Once the effect has + * expired, it will be automatically removed and need not to be removed with + * {@link #removeEffect(Actor, Effect)} + *

+ * Note: some effects will return null. Those effects do + * not have an temporal effect and thus are not added to the + * actor effect list. * - * @param character - * the character - * @param duration - * the effect duration in milliseconds + * @param actor + * the actor which the effect will be applied to + * @param effectTemplate + * the effect template that will be applied to actor + * @return the effect. Can be null + * @throws L2Exception + * if any exception while applying the effect */ - void addEffect(L2Character character, long duration); + Effect addEffect(Actor actor, EffectTemplate effectTemplate) + throws L2Exception; + + /** + * Forcefully removes an effect from the given character. Only + * use this to remove the effect before it expires + * + * @param actor + * the actor which the effect will be removed from + * @param effect + * the effect that will be removed from actor + */ + void removeEffect(Actor actor, Effect effect); } diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/effect/SimpleEffectService.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/effect/SimpleEffectService.java new file mode 100644 index 000000000..16106c9b6 --- /dev/null +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/effect/SimpleEffectService.java @@ -0,0 +1,120 @@ +/* + * This file is part of l2jserver2 . + * + * l2jserver2 is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver2 is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver2. If not, see . + */ +package com.l2jserver.service.game.effect; + +import java.util.List; +import java.util.concurrent.TimeUnit; + +import com.google.inject.Inject; +import com.l2jserver.model.template.effect.EffectTemplate; +import com.l2jserver.model.world.Actor; +import com.l2jserver.model.world.actor.ActorEffectContainer; +import com.l2jserver.model.world.actor.effect.Effect; +import com.l2jserver.model.world.actor.effect.TemporalEffect; +import com.l2jserver.model.world.actor.effect.TemporalEffect.TemporalEffectAction; +import com.l2jserver.service.AbstractService; +import com.l2jserver.service.ServiceStartException; +import com.l2jserver.service.ServiceStopException; +import com.l2jserver.service.core.threading.ThreadPool; +import com.l2jserver.service.core.threading.ThreadService; +import com.l2jserver.util.exception.L2Exception; +import com.l2jserver.util.factory.CollectionFactory; + +/** + * An simple {@link EffectService} implementation that uses a fixed tick time to + * calculate effects. + * + * @author Rogiel + */ +public class SimpleEffectService extends AbstractService implements + EffectService { + /** + * The thread service that will create {@link ThreadPool}s + */ + private final ThreadService threadService; + + /** + * The {@link ThreadPool} that will execute the effect code + */ + private ThreadPool pool; + /** + * All active effects + */ + private List actors; + + @Inject + private SimpleEffectService(ThreadService threadService) { + this.threadService = threadService; + } + + @Override + protected void doStart() throws ServiceStartException { + pool = threadService.createThreadPool("EffectService", 20); + for (int i = 0; i < 20; i++) { + pool.async(10, TimeUnit.MILLISECONDS, 10, new Runnable() { + @Override + public void run() { + for (final Actor actor : actors) { + final ActorEffectContainer container = actor + .getEffects(); + synchronized (actor) { + for (final Effect effect : container) { + if (effect instanceof TemporalEffect) { + TemporalEffectAction action = ((TemporalEffect) effect) + .continueEffect(); + switch (action) { + case CANCEL: + ((TemporalEffect) effect) + .cancelEffect(); + container.removeEffect(effect); + break; + } + } else { + container.removeEffect(effect); + } + } + } + } + } + }); + } + actors = CollectionFactory.newList(); + } + + @Override + public Effect addEffect(Actor actor, EffectTemplate effectTemplate) + throws L2Exception { + final Effect effect = effectTemplate.createEffect(actor); + effect.applyEffect(); + if (effect instanceof TemporalEffect) { + actor.getEffects().addEffect(effect); + return effect; + } + // non-temporal effect returns null + return null; + } + + @Override + public void removeEffect(Actor actor, Effect effect) { + + } + + @Override + protected void doStop() throws ServiceStopException { + pool.dispose(); + } +} diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/map/GeoDataMapService.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/map/GeoDataMapService.java index 4003c16b6..00a7e36ae 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/map/GeoDataMapService.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/map/GeoDataMapService.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.map; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/map/MapService.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/map/MapService.java index 24eb3833b..800802d77 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/map/MapService.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/map/MapService.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.map; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/map/Tile.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/map/Tile.java index 4741954de..fb3f09e01 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/map/Tile.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/map/Tile.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.map; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/map/pathing/AStarPathingService.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/map/pathing/AStarPathingService.java index f68737254..dbba05bec 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/map/pathing/AStarPathingService.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/map/pathing/AStarPathingService.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.map.pathing; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/map/pathing/AbstractPath.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/map/pathing/AbstractPath.java index 59dcade44..5bf02c470 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/map/pathing/AbstractPath.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/map/pathing/AbstractPath.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.map.pathing; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/map/pathing/MapperPathingService.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/map/pathing/MapperPathingService.java index 249a10064..7475db2e3 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/map/pathing/MapperPathingService.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/map/pathing/MapperPathingService.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.map.pathing; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/map/pathing/Path.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/map/pathing/Path.java index 94d660562..deff9373e 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/map/pathing/Path.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/map/pathing/Path.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.map.pathing; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/map/pathing/PathingService.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/map/pathing/PathingService.java index de8e3ae7b..fbc63c864 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/map/pathing/PathingService.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/map/pathing/PathingService.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.map.pathing; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/npc/ActionServiceException.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/npc/ActionServiceException.java index 09779af74..33042af2e 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/npc/ActionServiceException.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/npc/ActionServiceException.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.npc; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/npc/NPCService.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/npc/NPCService.java index 600afd563..dbd36e853 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/npc/NPCService.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/npc/NPCService.java @@ -1,24 +1,24 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.npc; import com.l2jserver.game.net.Lineage2Client; import com.l2jserver.game.net.packet.client.CM_CHAR_ACTION.CharacterAction; -import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.template.npc.NPCTemplate; import com.l2jserver.model.world.Actor; import com.l2jserver.model.world.L2Character; import com.l2jserver.model.world.NPC; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/npc/NPCServiceException.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/npc/NPCServiceException.java index e5e86cd74..8062ceadd 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/npc/NPCServiceException.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/npc/NPCServiceException.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.npc; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/npc/NPCServiceImpl.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/npc/NPCServiceImpl.java index 78a9e251f..30796fa1d 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/npc/NPCServiceImpl.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/npc/NPCServiceImpl.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.npc; @@ -32,7 +32,7 @@ import com.google.inject.Injector; import com.l2jserver.game.net.Lineage2Client; import com.l2jserver.game.net.packet.client.CM_CHAR_ACTION.CharacterAction; import com.l2jserver.model.dao.NPCDAO; -import com.l2jserver.model.template.NPCTemplate; +import com.l2jserver.model.template.npc.NPCTemplate; import com.l2jserver.model.world.Actor; import com.l2jserver.model.world.Actor.ActorState; import com.l2jserver.model.world.L2Character; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/npc/NotAttackableNPCServiceException.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/npc/NotAttackableNPCServiceException.java index 52c370c66..ca007094f 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/npc/NotAttackableNPCServiceException.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/npc/NotAttackableNPCServiceException.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.npc; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/region/Region.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/region/Region.java index 178bda51c..588668464 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/region/Region.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/region/Region.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.region; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/region/RegionService.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/region/RegionService.java index b075bdaca..680459eb3 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/region/RegionService.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/region/RegionService.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.region; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/CompilationResult.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/CompilationResult.java index 441b1e0ef..ef5d4d036 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/CompilationResult.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/CompilationResult.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.scripting; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/ScriptCompiler.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/ScriptCompiler.java index ff48d49ad..6c648b4f2 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/ScriptCompiler.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/ScriptCompiler.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.scripting; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/ScriptingService.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/ScriptingService.java index be619a99b..e164aa4bc 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/ScriptingService.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/ScriptingService.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.scripting; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/ScriptingServiceImpl.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/ScriptingServiceImpl.java index 07d6b39e6..6ff834124 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/ScriptingServiceImpl.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/ScriptingServiceImpl.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.scripting; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/classlistener/ClassListener.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/classlistener/ClassListener.java index 09d382c7f..96eefdeee 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/classlistener/ClassListener.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/classlistener/ClassListener.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.scripting.classlistener; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/classlistener/Loader.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/classlistener/Loader.java index 973418c61..e974b0f3d 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/classlistener/Loader.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/classlistener/Loader.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.scripting.classlistener; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/classlistener/Unloader.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/classlistener/Unloader.java index 6590d52ce..76847cb9b 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/classlistener/Unloader.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/classlistener/Unloader.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.scripting.classlistener; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/spawn/AlreadySpawnedServiceException.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/spawn/AlreadySpawnedServiceException.java index da0edcd5c..82d24f2aa 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/spawn/AlreadySpawnedServiceException.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/spawn/AlreadySpawnedServiceException.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.spawn; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/spawn/CharacterAlreadyTeleportingServiceException.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/spawn/CharacterAlreadyTeleportingServiceException.java index ee77e2b77..455deda2a 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/spawn/CharacterAlreadyTeleportingServiceException.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/spawn/CharacterAlreadyTeleportingServiceException.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.spawn; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/spawn/CharacterNotTeleportingServiceException.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/spawn/CharacterNotTeleportingServiceException.java index fb85900f6..94c4277ec 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/spawn/CharacterNotTeleportingServiceException.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/spawn/CharacterNotTeleportingServiceException.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.spawn; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/spawn/NotSpawnedServiceException.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/spawn/NotSpawnedServiceException.java index 82edbd537..762665113 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/spawn/NotSpawnedServiceException.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/spawn/NotSpawnedServiceException.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.spawn; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/spawn/SpawnPointNotFoundServiceException.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/spawn/SpawnPointNotFoundServiceException.java index 1258ca0a7..ce6b9b8a5 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/spawn/SpawnPointNotFoundServiceException.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/spawn/SpawnPointNotFoundServiceException.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.spawn; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/spawn/SpawnService.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/spawn/SpawnService.java index 16ab49c91..e09703cc5 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/spawn/SpawnService.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/spawn/SpawnService.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.spawn; @@ -23,11 +23,10 @@ import com.l2jserver.model.world.Actor.ActorState; import com.l2jserver.model.world.Item; import com.l2jserver.model.world.L2Character; import com.l2jserver.model.world.NPC; -import com.l2jserver.model.world.Player; import com.l2jserver.model.world.PositionableObject; +import com.l2jserver.model.world.actor.event.ActorTeleportingEvent; import com.l2jserver.model.world.event.SpawnEvent; import com.l2jserver.model.world.player.event.PlayerTeleportedEvent; -import com.l2jserver.model.world.player.event.PlayerTeleportingEvent; import com.l2jserver.service.Service; import com.l2jserver.service.core.threading.AsyncFuture; import com.l2jserver.service.core.threading.ThreadService; @@ -130,20 +129,20 @@ public interface SpawnService extends Service { /** * Teleports the object to the given point. *

- * An {@link PlayerTeleportingEvent} will be dispatched and the new position + * An {@link ActorTeleportingEvent} will be dispatched and the new position * will be broadcast to all clients. * - * @param player - * the player object + * @param actor + * the actor object * @param coordinate * the teleportation coordinate * @throws NotSpawnedServiceException * if the object to be teleported is not spawned * @throws CharacterAlreadyTeleportingServiceException - * if this player is already being teleported. This will only be - * thrown for {@link L2Character} instances. + * if actor is already being teleported. This will only + * be thrown for {@link L2Character} instances. */ - void teleport(Player player, Coordinate coordinate) + void teleport(Actor actor, Coordinate coordinate) throws NotSpawnedServiceException, CharacterAlreadyTeleportingServiceException; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/spawn/SpawnServiceException.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/spawn/SpawnServiceException.java index 50a703063..7ef2d3643 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/spawn/SpawnServiceException.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/spawn/SpawnServiceException.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.spawn; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/spawn/SpawnServiceImpl.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/spawn/SpawnServiceImpl.java index 0bcca1710..c49ca12f2 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/spawn/SpawnServiceImpl.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/spawn/SpawnServiceImpl.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.spawn; @@ -33,14 +33,13 @@ import com.l2jserver.model.world.Actor; import com.l2jserver.model.world.Actor.ActorState; import com.l2jserver.model.world.L2Character; import com.l2jserver.model.world.NPC; -import com.l2jserver.model.world.Player; import com.l2jserver.model.world.PositionableObject; +import com.l2jserver.model.world.actor.event.ActorTeleportingEvent; import com.l2jserver.model.world.event.SpawnEvent; import com.l2jserver.model.world.event.UnspawnEvent; import com.l2jserver.model.world.npc.event.NPCSpawnEvent; import com.l2jserver.model.world.npc.event.NPCUnspawnEvent; import com.l2jserver.model.world.player.event.PlayerTeleportedEvent; -import com.l2jserver.model.world.player.event.PlayerTeleportingEvent; import com.l2jserver.service.AbstractService; import com.l2jserver.service.AbstractService.Depends; import com.l2jserver.service.core.threading.AsyncFuture; @@ -219,31 +218,31 @@ public class SpawnServiceImpl extends AbstractService implements SpawnService { } @Override - public void teleport(Player player, Coordinate coordinate) + public void teleport(Actor actor, Coordinate coordinate) throws CharacterAlreadyTeleportingServiceException { - Preconditions.checkNotNull(player, "player"); + Preconditions.checkNotNull(actor, "actor"); Preconditions.checkNotNull(coordinate, "coordinate"); - log.debug("Teleporting {} to {}", player, coordinate); + log.debug("Teleporting {} to {}", actor, coordinate); - if (player instanceof L2Character) { - if (((L2Character) player).isTeleporting()) + if (actor instanceof L2Character) { + if (((L2Character) actor).isTeleporting()) throw new CharacterAlreadyTeleportingServiceException(); final Lineage2Client conn = networkService - .discover((CharacterID) player.getID()); + .discover((CharacterID) actor.getID()); if (conn == null) // TODO throw an exception here return; conn.write(new SM_TELEPORT(conn.getCharacter(), coordinate .toPoint())); - ((L2Character) player).setState(ActorState.TELEPORTING); - ((L2Character) player).setTargetLocation(coordinate.toPoint()); + ((L2Character) actor).setState(ActorState.TELEPORTING); + ((L2Character) actor).setTargetLocation(coordinate.toPoint()); } else { - player.setPosition(coordinate); + actor.setPosition(coordinate); } // dispatch teleport event - eventDispatcher.dispatch(new PlayerTeleportingEvent(player, coordinate + eventDispatcher.dispatch(new ActorTeleportingEvent(actor, coordinate .toPoint())); // remember: broadcasting is done through events! } diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/template/TemplateService.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/template/TemplateService.java index 2a4242403..542ac5a99 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/template/TemplateService.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/template/TemplateService.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.template; @@ -54,5 +54,5 @@ public interface TemplateService extends Service { * the template id * @return the template */ - > T getTemplate(TemplateID id); + T getTemplate(TemplateID id); } diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/template/XMLTemplateService.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/template/XMLTemplateService.java index e25606240..b95913b5a 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/template/XMLTemplateService.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/template/XMLTemplateService.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.template; @@ -42,12 +42,12 @@ import org.slf4j.LoggerFactory; import com.google.common.base.Preconditions; import com.google.inject.Inject; import com.l2jserver.model.id.TemplateID; -import com.l2jserver.model.template.CharacterTemplate; -import com.l2jserver.model.template.ItemTemplate; -import com.l2jserver.model.template.NPCTemplate; import com.l2jserver.model.template.SkillTemplate; -import com.l2jserver.model.template.TeleportationTemplate; import com.l2jserver.model.template.Template; +import com.l2jserver.model.template.character.CharacterTemplate; +import com.l2jserver.model.template.item.ItemTemplate; +import com.l2jserver.model.template.npc.NPCTemplate; +import com.l2jserver.model.template.npc.TeleportationTemplate; import com.l2jserver.service.AbstractService; import com.l2jserver.service.AbstractService.Depends; import com.l2jserver.service.ServiceStartException; @@ -61,6 +61,7 @@ import com.l2jserver.service.configuration.XMLConfigurationService.Configuration import com.l2jserver.service.core.LoggingService; import com.l2jserver.service.core.vfs.VFSService; import com.l2jserver.util.jaxb.CharacterTemplateIDAdapter; +import com.l2jserver.util.jaxb.EffectTemplateIDAdapter; import com.l2jserver.util.jaxb.ItemTemplateIDAdapter; import com.l2jserver.util.jaxb.NPCTemplateIDAdapter; import com.l2jserver.util.jaxb.SkillTemplateIDAdapter; @@ -111,7 +112,11 @@ public class XMLTemplateService extends AbstractService implements */ private final CharacterTemplateIDAdapter charIdTemplateAdapter; /** - * The teleportation template id adapater + * The effect template id adapter + */ + private final EffectTemplateIDAdapter effectIdTemplateAdapter; + /** + * The teleportation template id adapter */ private final TeleportationTemplateIDAdapter teleportationIdTemplateAdapter; @@ -171,6 +176,8 @@ public class XMLTemplateService extends AbstractService implements * the skill template id adapter * @param charIdTemplateAdapter * the character id template adapter + * @param effectIdTemplateAdapter + * the effect id template adapter * @param teleportationIdTemplateAdapter * the teleportation template id adapter */ @@ -181,6 +188,7 @@ public class XMLTemplateService extends AbstractService implements ItemTemplateIDAdapter itemTemplateIdAdapter, SkillTemplateIDAdapter skillTemplateIdAdapter, CharacterTemplateIDAdapter charIdTemplateAdapter, + EffectTemplateIDAdapter effectIdTemplateAdapter, TeleportationTemplateIDAdapter teleportationIdTemplateAdapter) { this.vfsService = vfsService; this.cacheService = cacheService; @@ -189,6 +197,7 @@ public class XMLTemplateService extends AbstractService implements this.itemTemplateIdAdapter = itemTemplateIdAdapter; this.skillTemplateIdAdapter = skillTemplateIdAdapter; this.charIdTemplateAdapter = charIdTemplateAdapter; + this.effectIdTemplateAdapter = effectIdTemplateAdapter; this.teleportationIdTemplateAdapter = teleportationIdTemplateAdapter; } @@ -204,16 +213,12 @@ public class XMLTemplateService extends AbstractService implements log.debug("Creating Unmarshaller instance"); unmarshaller = context.createUnmarshaller(); - unmarshaller.setAdapter(NPCTemplateIDAdapter.class, - npcTemplateIdAdapter); - unmarshaller.setAdapter(ItemTemplateIDAdapter.class, - itemTemplateIdAdapter); - unmarshaller.setAdapter(SkillTemplateIDAdapter.class, - skillTemplateIdAdapter); - unmarshaller.setAdapter(CharacterTemplateIDAdapter.class, - charIdTemplateAdapter); - unmarshaller.setAdapter(TeleportationTemplateIDAdapter.class, - teleportationIdTemplateAdapter); + unmarshaller.setAdapter(npcTemplateIdAdapter); + unmarshaller.setAdapter(itemTemplateIdAdapter); + unmarshaller.setAdapter(skillTemplateIdAdapter); + unmarshaller.setAdapter(charIdTemplateAdapter); + unmarshaller.setAdapter(effectIdTemplateAdapter); + unmarshaller.setAdapter(teleportationIdTemplateAdapter); final Path templatePath = vfsService.resolve(config .getTemplateDirectory().toString()); @@ -255,7 +260,7 @@ public class XMLTemplateService extends AbstractService implements @Override @SuppressWarnings("unchecked") - public > T getTemplate(TemplateID id) { + public T getTemplate(TemplateID id) { Preconditions.checkNotNull(id, "id"); return (T) templates.get(id); } @@ -277,12 +282,12 @@ public class XMLTemplateService extends AbstractService implements try { Object obj = unmarshaller.unmarshal(in); if (obj instanceof Template) { - final Template template = (Template) obj; + final Template template = (Template) obj; log.debug("Template loaded: {}", template); if (template.getID() != null) templates.put(template.getID(), template); } else if (obj instanceof TeleportationTemplateContainer) { - for (final Template template : ((TeleportationTemplateContainer) obj).templates) { + for (final Template template : ((TeleportationTemplateContainer) obj).templates) { log.debug("Template loaded: {}", template); if (template.getID() != null) templates.put(template.getID(), template); @@ -299,7 +304,7 @@ public class XMLTemplateService extends AbstractService implements * @param template * the template to be purged */ - public void removeTemplate(Template template) { + public void removeTemplate(Template template) { Preconditions.checkNotNull(template, "template"); log.debug("Removing template {}", template); templates.remove(template.getID()); diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/CachedWorldIDService.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/CachedWorldIDService.java index 3085629bd..fd4bf160c 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/CachedWorldIDService.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/CachedWorldIDService.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.world; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/WorldIDService.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/WorldIDService.java index 80eae567e..6cf5f609d 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/WorldIDService.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/WorldIDService.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.world; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/WorldService.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/WorldService.java index de60f6f3b..c5ae11ac9 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/WorldService.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/WorldService.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.world; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/WorldServiceImpl.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/WorldServiceImpl.java index f33465714..b16b16112 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/WorldServiceImpl.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/WorldServiceImpl.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.world; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/event/FilteredWorldListener.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/event/FilteredWorldListener.java index 4e7d45c48..0da6f52fa 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/event/FilteredWorldListener.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/event/FilteredWorldListener.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.world.event; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/event/TypedWorldListener.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/event/TypedWorldListener.java index 6a9b8d2e8..5f0ce8784 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/event/TypedWorldListener.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/event/TypedWorldListener.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.world.event; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/event/WorldEvent.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/event/WorldEvent.java index ddc9bf38e..fab8c2f92 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/event/WorldEvent.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/event/WorldEvent.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.world.event; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/event/WorldEventDispatcher.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/event/WorldEventDispatcher.java index 381a3660c..3e355ee80 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/event/WorldEventDispatcher.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/event/WorldEventDispatcher.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.world.event; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/event/WorldEventDispatcherImpl.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/event/WorldEventDispatcherImpl.java index 8e9af6d3d..514490a6c 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/event/WorldEventDispatcherImpl.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/event/WorldEventDispatcherImpl.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.world.event; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/event/WorldEventFuture.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/event/WorldEventFuture.java index dc642e746..772a9baf2 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/event/WorldEventFuture.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/event/WorldEventFuture.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.world.event; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/event/WorldListener.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/event/WorldListener.java index 3849d2cbf..826ca1162 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/event/WorldListener.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/event/WorldListener.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.world.event; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/AndFilter.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/AndFilter.java index 63833c5e4..d180bf84a 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/AndFilter.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/AndFilter.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.world.filter; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/ExcludeFilter.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/ExcludeFilter.java index 8a1536fbc..c75d0fcb9 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/ExcludeFilter.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/ExcludeFilter.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.world.filter; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/FilterIterator.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/FilterIterator.java index 5cbc80d01..71bbe965d 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/FilterIterator.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/FilterIterator.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.world.filter; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/NotFilter.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/NotFilter.java index c7abca756..984c0c634 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/NotFilter.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/NotFilter.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.world.filter; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/OrFilter.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/OrFilter.java index 5e8e78606..e59206474 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/OrFilter.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/OrFilter.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.world.filter; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/WorldFilters.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/WorldFilters.java index cbad48688..95732525d 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/WorldFilters.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/WorldFilters.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.world.filter; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/WorldObjectFilter.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/WorldObjectFilter.java index b59074516..89e01b23f 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/WorldObjectFilter.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/WorldObjectFilter.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.world.filter; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/impl/CharacterBroadcastFilter.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/impl/CharacterBroadcastFilter.java index 1f94b1b77..93eec8ffb 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/impl/CharacterBroadcastFilter.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/impl/CharacterBroadcastFilter.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.world.filter.impl; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/impl/IDFilter.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/impl/IDFilter.java index e47c39938..bccfeccc7 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/impl/IDFilter.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/impl/IDFilter.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.world.filter.impl; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/impl/InstanceFilter.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/impl/InstanceFilter.java index 697e1b7eb..9b958d8e7 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/impl/InstanceFilter.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/impl/InstanceFilter.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.world.filter.impl; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/impl/KnownListFilter.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/impl/KnownListFilter.java index bbf50411a..dca7b2556 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/impl/KnownListFilter.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/impl/KnownListFilter.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.world.filter.impl; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/impl/KnownListUpdateFilter.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/impl/KnownListUpdateFilter.java index f3bd6f885..642d7be45 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/impl/KnownListUpdateFilter.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/impl/KnownListUpdateFilter.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.world.filter.impl; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/impl/RangeFilter.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/impl/RangeFilter.java index 087afe7eb..061c346b9 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/impl/RangeFilter.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/impl/RangeFilter.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.world.filter.impl; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/impl/RangePointFilter.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/impl/RangePointFilter.java index 824d1e98e..06386b771 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/impl/RangePointFilter.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/impl/RangePointFilter.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.world.filter.impl; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/network/NettyNetworkService.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/network/NettyNetworkService.java index c0db80315..9081029d6 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/network/NettyNetworkService.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/network/NettyNetworkService.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.network; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/network/NetworkService.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/network/NetworkService.java index a8760da12..22d306835 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/network/NetworkService.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/network/NetworkService.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.network; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/network/broadcast/BroadcastService.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/network/broadcast/BroadcastService.java index 266b96bfe..d75057ba1 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/network/broadcast/BroadcastService.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/network/broadcast/BroadcastService.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.network.broadcast; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/network/broadcast/BroadcastServiceImpl.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/network/broadcast/BroadcastServiceImpl.java index c7b81843e..69d284485 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/network/broadcast/BroadcastServiceImpl.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/network/broadcast/BroadcastServiceImpl.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.network.broadcast; @@ -37,6 +37,7 @@ import com.l2jserver.model.world.PositionableObject; import com.l2jserver.model.world.WorldObject; import com.l2jserver.model.world.actor.event.ActorAttackHitEvent; import com.l2jserver.model.world.actor.event.ActorDieEvent; +import com.l2jserver.model.world.actor.event.ActorTeleportingEvent; import com.l2jserver.model.world.actor.event.ActorUnspawnEvent; import com.l2jserver.model.world.character.event.CharacterEnterWorldEvent; import com.l2jserver.model.world.character.event.CharacterLeaveWorldEvent; @@ -45,7 +46,6 @@ import com.l2jserver.model.world.character.event.CharacterRunningEvent; import com.l2jserver.model.world.character.event.CharacterWalkingEvent; import com.l2jserver.model.world.npc.event.NPCSpawnEvent; import com.l2jserver.model.world.player.event.PlayerTeleportedEvent; -import com.l2jserver.model.world.player.event.PlayerTeleportingEvent; import com.l2jserver.service.AbstractService; import com.l2jserver.service.AbstractService.Depends; import com.l2jserver.service.game.world.WorldService; @@ -121,7 +121,7 @@ public class BroadcastServiceImpl extends AbstractService implements } else if (e instanceof PlayerTeleportedEvent || e instanceof CharacterEnterWorldEvent) { broadcast(conn, e.getObject()); - } else if (e instanceof PlayerTeleportingEvent + } else if (e instanceof ActorTeleportingEvent || e instanceof CharacterLeaveWorldEvent || e instanceof ActorUnspawnEvent) { // object is now out of sight diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/network/gameguard/GameGuardService.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/network/gameguard/GameGuardService.java index 5c2352c21..5a4aa38af 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/network/gameguard/GameGuardService.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/network/gameguard/GameGuardService.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.network.gameguard; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/network/gameguard/GameGuardServiceImpl.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/network/gameguard/GameGuardServiceImpl.java index 541e6222b..faa527499 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/network/gameguard/GameGuardServiceImpl.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/network/gameguard/GameGuardServiceImpl.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.network.gameguard; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/network/keygen/BlowfishKeygenService.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/network/keygen/BlowfishKeygenService.java index b184e3a2e..f5cc92d63 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/network/keygen/BlowfishKeygenService.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/network/keygen/BlowfishKeygenService.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.network.keygen; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/network/keygen/PseudoRandomBlowfishKeygenService.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/network/keygen/PseudoRandomBlowfishKeygenService.java index ddf23a217..7844a2dd3 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/network/keygen/PseudoRandomBlowfishKeygenService.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/network/keygen/PseudoRandomBlowfishKeygenService.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.network.keygen; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/network/keygen/SecureBlowfishKeygenService.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/network/keygen/SecureBlowfishKeygenService.java index b6df67d4a..368d37d38 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/network/keygen/SecureBlowfishKeygenService.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/network/keygen/SecureBlowfishKeygenService.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.network.keygen; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/calculator/AbstractDoubleFunction.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/util/calculator/AbstractDoubleFunction.java index c5cfeb3c9..b69d99768 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/calculator/AbstractDoubleFunction.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/util/calculator/AbstractDoubleFunction.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.util.calculator; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/calculator/Calculator.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/util/calculator/Calculator.java index ed1cbccc7..cc85d67f4 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/calculator/Calculator.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/util/calculator/Calculator.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.util.calculator; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/calculator/CalculatorContext.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/util/calculator/CalculatorContext.java index 321f789e8..6d6531282 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/calculator/CalculatorContext.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/util/calculator/CalculatorContext.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.util.calculator; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/calculator/ComplexCalculator.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/util/calculator/ComplexCalculator.java index df5eb6ba7..9a87e2abc 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/calculator/ComplexCalculator.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/util/calculator/ComplexCalculator.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.util.calculator; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/calculator/Function.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/util/calculator/Function.java index 11890fb31..645e9032f 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/calculator/Function.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/util/calculator/Function.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.util.calculator; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/calculator/SimpleCalculator.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/util/calculator/SimpleCalculator.java index e243eec3f..34e6f7999 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/calculator/SimpleCalculator.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/util/calculator/SimpleCalculator.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.util.calculator; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/L2BodyTag.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/L2BodyTag.java index bc6579891..dbda6909f 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/L2BodyTag.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/L2BodyTag.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.util.html; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/L2BrTag.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/L2BrTag.java index 4080a9a50..a79b9ddaf 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/L2BrTag.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/L2BrTag.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.util.html; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/L2CenterTag.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/L2CenterTag.java index 02425ad9a..d769403e6 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/L2CenterTag.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/L2CenterTag.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.util.html; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/L2DivTag.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/L2DivTag.java index a9c4e10ac..9193ae67b 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/L2DivTag.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/L2DivTag.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.util.html; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/L2FontTag.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/L2FontTag.java index 9351f6580..706cb7f5e 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/L2FontTag.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/L2FontTag.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.util.html; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/L2HeadTag.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/L2HeadTag.java index 1be4d1ae6..1f1ce8bc1 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/L2HeadTag.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/L2HeadTag.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.util.html; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/L2HtmlTag.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/L2HtmlTag.java index 04228ff8b..4aa7015c1 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/L2HtmlTag.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/L2HtmlTag.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.util.html; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/L2ImageTag.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/L2ImageTag.java index 57a598521..d12817576 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/L2ImageTag.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/L2ImageTag.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.util.html; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/L2LinkTag.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/L2LinkTag.java index d3b93ce37..225035927 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/L2LinkTag.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/L2LinkTag.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.util.html; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/L2NewLineTag.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/L2NewLineTag.java index eb744a51a..da68b909c 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/L2NewLineTag.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/L2NewLineTag.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.util.html; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/L2TitleTag.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/L2TitleTag.java index b14965cf4..306df6592 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/L2TitleTag.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/L2TitleTag.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.util.html; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/markup/HtmlTemplate.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/markup/HtmlTemplate.java index a785dd023..693e69ea9 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/markup/HtmlTemplate.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/markup/HtmlTemplate.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.util.html.markup; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/markup/MarkupTag.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/markup/MarkupTag.java index 1fb15761b..2c0402da3 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/markup/MarkupTag.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/markup/MarkupTag.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.util.html.markup; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/jaxb/CharacterTemplateIDAdapter.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/util/jaxb/CharacterTemplateIDAdapter.java index 537fc361e..f5d8652db 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/jaxb/CharacterTemplateIDAdapter.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/util/jaxb/CharacterTemplateIDAdapter.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.util.jaxb; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/jaxb/CoordinateAdapter.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/util/jaxb/CoordinateAdapter.java index 1f8d5b31e..7350c7183 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/jaxb/CoordinateAdapter.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/util/jaxb/CoordinateAdapter.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.util.jaxb; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/jaxb/EffectTemplateIDAdapter.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/util/jaxb/EffectTemplateIDAdapter.java new file mode 100644 index 000000000..f5d1ed207 --- /dev/null +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/util/jaxb/EffectTemplateIDAdapter.java @@ -0,0 +1,69 @@ +/* + * This file is part of l2jserver2 . + * + * l2jserver2 is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver2 is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver2. If not, see . + */ +package com.l2jserver.util.jaxb; + +import javax.xml.bind.annotation.adapters.XmlAdapter; + +import com.google.inject.Inject; +import com.l2jserver.model.game.Skill; +import com.l2jserver.model.id.template.EffectTemplateID; +import com.l2jserver.model.id.template.provider.EffectTemplateIDProvider; + +/** + * This class is an JAXB Adapter for {@link EffectTemplateID} + * + * @author Rogiel + */ +public class EffectTemplateIDAdapter extends + XmlAdapter { + /** + * The {@link Skill} template id provider + */ + private final EffectTemplateIDProvider provider; + + /** + * Creates a new empty instance + */ + public EffectTemplateIDAdapter() { + provider = null; + } + + /** + * @param provider + * the {@link Skill} template id provider + */ + @Inject + public EffectTemplateIDAdapter(EffectTemplateIDProvider provider) { + this.provider = provider; + } + + @Override + public EffectTemplateID unmarshal(Integer v) throws Exception { + if (v == 0) + return null; + if (provider == null) + return new EffectTemplateID(v, null); + return provider.resolveID(v); + } + + @Override + public Integer marshal(EffectTemplateID v) throws Exception { + if (v == null) + return 0; + return v.getID(); + } +} diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/jaxb/ItemTemplateIDAdapter.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/util/jaxb/ItemTemplateIDAdapter.java index b3139cc6d..43fc2b7da 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/jaxb/ItemTemplateIDAdapter.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/util/jaxb/ItemTemplateIDAdapter.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.util.jaxb; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/jaxb/MapAdapter.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/util/jaxb/MapAdapter.java index c471f6527..1b1bb29ad 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/jaxb/MapAdapter.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/util/jaxb/MapAdapter.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.util.jaxb; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/jaxb/NPCTemplateIDAdapter.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/util/jaxb/NPCTemplateIDAdapter.java index 1e1b70ead..6423843d5 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/jaxb/NPCTemplateIDAdapter.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/util/jaxb/NPCTemplateIDAdapter.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.util.jaxb; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/jaxb/SkillTemplateIDAdapter.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/util/jaxb/SkillTemplateIDAdapter.java index 4e8ea443f..5b86f4047 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/jaxb/SkillTemplateIDAdapter.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/util/jaxb/SkillTemplateIDAdapter.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.util.jaxb; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/jaxb/TeleportationTemplateIDAdapter.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/util/jaxb/TeleportationTemplateIDAdapter.java index 3cb97ae0d..01ce0dd60 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/jaxb/TeleportationTemplateIDAdapter.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/util/jaxb/TeleportationTemplateIDAdapter.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.util.jaxb; diff --git a/l2jserver2-gameserver/src/test/java/com/l2jserver/db/dao/mysql5/MySQL5CharacterDAOTest.java b/l2jserver2-gameserver/src/test/java/com/l2jserver/db/dao/mysql5/MySQL5CharacterDAOTest.java index 0a09923ff..d9aa024fa 100644 --- a/l2jserver2-gameserver/src/test/java/com/l2jserver/db/dao/mysql5/MySQL5CharacterDAOTest.java +++ b/l2jserver2-gameserver/src/test/java/com/l2jserver/db/dao/mysql5/MySQL5CharacterDAOTest.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.db.dao.mysql5; diff --git a/l2jserver2-gameserver/src/test/java/com/l2jserver/model/id/provider/CharacterIDProviderTest.java b/l2jserver2-gameserver/src/test/java/com/l2jserver/model/id/provider/CharacterIDProviderTest.java index cfaac26b0..07eec683e 100644 --- a/l2jserver2-gameserver/src/test/java/com/l2jserver/model/id/provider/CharacterIDProviderTest.java +++ b/l2jserver2-gameserver/src/test/java/com/l2jserver/model/id/provider/CharacterIDProviderTest.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.id.provider; diff --git a/l2jserver2-gameserver/src/test/java/com/l2jserver/service/game/scripting/ScriptingServiceImplTest.java b/l2jserver2-gameserver/src/test/java/com/l2jserver/service/game/scripting/ScriptingServiceImplTest.java index dd449d98e..491d9f6ab 100644 --- a/l2jserver2-gameserver/src/test/java/com/l2jserver/service/game/scripting/ScriptingServiceImplTest.java +++ b/l2jserver2-gameserver/src/test/java/com/l2jserver/service/game/scripting/ScriptingServiceImplTest.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.scripting; diff --git a/l2jserver2-gameserver/src/test/java/com/l2jserver/service/game/template/StaticTemplateServiceTest.java b/l2jserver2-gameserver/src/test/java/com/l2jserver/service/game/template/StaticTemplateServiceTest.java index 88eb58f93..b081ae6d7 100644 --- a/l2jserver2-gameserver/src/test/java/com/l2jserver/service/game/template/StaticTemplateServiceTest.java +++ b/l2jserver2-gameserver/src/test/java/com/l2jserver/service/game/template/StaticTemplateServiceTest.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.game.template; diff --git a/l2jserver2-gameserver/src/test/java/com/l2jserver/service/world/WorldEventDispatcherImplTest.java b/l2jserver2-gameserver/src/test/java/com/l2jserver/service/world/WorldEventDispatcherImplTest.java index 23f1bfc12..4d7d00fed 100644 --- a/l2jserver2-gameserver/src/test/java/com/l2jserver/service/world/WorldEventDispatcherImplTest.java +++ b/l2jserver2-gameserver/src/test/java/com/l2jserver/service/world/WorldEventDispatcherImplTest.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.world; diff --git a/l2jserver2-gameserver/src/test/java/com/l2jserver/service/world/WorldServiceImplTest.java b/l2jserver2-gameserver/src/test/java/com/l2jserver/service/world/WorldServiceImplTest.java index 4dc29f26a..cf6cbaf21 100644 --- a/l2jserver2-gameserver/src/test/java/com/l2jserver/service/world/WorldServiceImplTest.java +++ b/l2jserver2-gameserver/src/test/java/com/l2jserver/service/world/WorldServiceImplTest.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.world; diff --git a/l2jserver2-gameserver/src/test/java/com/l2jserver/util/calculator/CalculatorTest.java b/l2jserver2-gameserver/src/test/java/com/l2jserver/util/calculator/CalculatorTest.java index 9783e6b8b..62a4caeab 100644 --- a/l2jserver2-gameserver/src/test/java/com/l2jserver/util/calculator/CalculatorTest.java +++ b/l2jserver2-gameserver/src/test/java/com/l2jserver/util/calculator/CalculatorTest.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.util.calculator; diff --git a/l2jserver2-loginserver/src/main/java/com/l2jserver/service/database/H2DAOModule.java b/l2jserver2-loginserver/src/main/java/com/l2jserver/service/database/H2DAOModule.java index 0af18e7fe..3a95b0bdd 100644 --- a/l2jserver2-loginserver/src/main/java/com/l2jserver/service/database/H2DAOModule.java +++ b/l2jserver2-loginserver/src/main/java/com/l2jserver/service/database/H2DAOModule.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.database; diff --git a/l2jserver2-loginserver/src/main/java/com/l2jserver/service/database/LoginServerJDBCDatabaseService.java b/l2jserver2-loginserver/src/main/java/com/l2jserver/service/database/LoginServerJDBCDatabaseService.java index d1469efe8..b37e16c7c 100644 --- a/l2jserver2-loginserver/src/main/java/com/l2jserver/service/database/LoginServerJDBCDatabaseService.java +++ b/l2jserver2-loginserver/src/main/java/com/l2jserver/service/database/LoginServerJDBCDatabaseService.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.database; diff --git a/l2jserver2-loginserver/src/main/java/com/l2jserver/service/database/MySQL5DAOModule.java b/l2jserver2-loginserver/src/main/java/com/l2jserver/service/database/MySQL5DAOModule.java index b984d88a5..86b356ef5 100644 --- a/l2jserver2-loginserver/src/main/java/com/l2jserver/service/database/MySQL5DAOModule.java +++ b/l2jserver2-loginserver/src/main/java/com/l2jserver/service/database/MySQL5DAOModule.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.database; diff --git a/l2jserver2-loginserver/src/main/java/com/l2jserver/service/gameserver/GameServerNetworkService.java b/l2jserver2-loginserver/src/main/java/com/l2jserver/service/gameserver/GameServerNetworkService.java index 41d2f06be..cb61c883b 100644 --- a/l2jserver2-loginserver/src/main/java/com/l2jserver/service/gameserver/GameServerNetworkService.java +++ b/l2jserver2-loginserver/src/main/java/com/l2jserver/service/gameserver/GameServerNetworkService.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.service.gameserver; diff --git a/l2jserver2-tools/src/main/java/com/l2jserver/model/template/SkillTemplateConverter.java b/l2jserver2-tools/src/main/java/com/l2jserver/model/template/SkillTemplateConverter.java index 33fdb6070..e892812c1 100644 --- a/l2jserver2-tools/src/main/java/com/l2jserver/model/template/SkillTemplateConverter.java +++ b/l2jserver2-tools/src/main/java/com/l2jserver/model/template/SkillTemplateConverter.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.model.template; diff --git a/l2jserver2-tools/src/main/java/com/l2jserver/model/template/CharacterTemplateConverter.java b/l2jserver2-tools/src/main/java/com/l2jserver/model/template/character/CharacterTemplateConverter.java similarity index 80% rename from l2jserver2-tools/src/main/java/com/l2jserver/model/template/CharacterTemplateConverter.java rename to l2jserver2-tools/src/main/java/com/l2jserver/model/template/character/CharacterTemplateConverter.java index 6814edd37..534b7d475 100644 --- a/l2jserver2-tools/src/main/java/com/l2jserver/model/template/CharacterTemplateConverter.java +++ b/l2jserver2-tools/src/main/java/com/l2jserver/model/template/character/CharacterTemplateConverter.java @@ -1,20 +1,20 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ -package com.l2jserver.model.template; +package com.l2jserver.model.template.character; import java.io.File; import java.io.IOException; @@ -34,16 +34,17 @@ import javax.xml.transform.Result; import javax.xml.transform.stream.StreamResult; import com.l2jserver.model.id.template.CharacterTemplateID; -import com.l2jserver.model.template.CharacterTemplate.CharacterStatsMetadata; -import com.l2jserver.model.template.CharacterTemplate.CharacterStatsMetadata.AttackMetadata; -import com.l2jserver.model.template.CharacterTemplate.CharacterStatsMetadata.AttackMetadata.AttackValueMetadata; -import com.l2jserver.model.template.CharacterTemplate.CharacterStatsMetadata.BaseMetadata; -import com.l2jserver.model.template.CharacterTemplate.CharacterStatsMetadata.DefenseMetadata; -import com.l2jserver.model.template.CharacterTemplate.CharacterStatsMetadata.DefenseMetadata.DefenseValueMetadata; -import com.l2jserver.model.template.CharacterTemplate.CharacterStatsMetadata.MoveMetadata; -import com.l2jserver.model.template.CharacterTemplate.CharacterStatsMetadata.Stat; -import com.l2jserver.model.template.CharacterTemplate.CollitionMetadataContainer; -import com.l2jserver.model.template.CharacterTemplate.CollitionMetadataContainer.CollisionMetadata; +import com.l2jserver.model.template.character.CharacterTemplate; +import com.l2jserver.model.template.character.CharacterTemplate.CharacterStatsMetadata; +import com.l2jserver.model.template.character.CharacterTemplate.CollitionMetadataContainer; +import com.l2jserver.model.template.character.CharacterTemplate.CharacterStatsMetadata.AttackMetadata; +import com.l2jserver.model.template.character.CharacterTemplate.CharacterStatsMetadata.BaseMetadata; +import com.l2jserver.model.template.character.CharacterTemplate.CharacterStatsMetadata.DefenseMetadata; +import com.l2jserver.model.template.character.CharacterTemplate.CharacterStatsMetadata.MoveMetadata; +import com.l2jserver.model.template.character.CharacterTemplate.CharacterStatsMetadata.Stat; +import com.l2jserver.model.template.character.CharacterTemplate.CharacterStatsMetadata.AttackMetadata.AttackValueMetadata; +import com.l2jserver.model.template.character.CharacterTemplate.CharacterStatsMetadata.DefenseMetadata.DefenseValueMetadata; +import com.l2jserver.model.template.character.CharacterTemplate.CollitionMetadataContainer.CollisionMetadata; /** * The need to use this package to get access to protected fields. diff --git a/l2jserver2-tools/src/main/java/com/l2jserver/model/template/NPCTemplateConverter.java b/l2jserver2-tools/src/main/java/com/l2jserver/model/template/npc/NPCTemplateConverter.java similarity index 88% rename from l2jserver2-tools/src/main/java/com/l2jserver/model/template/NPCTemplateConverter.java rename to l2jserver2-tools/src/main/java/com/l2jserver/model/template/npc/NPCTemplateConverter.java index 0977bbe41..5fb8faf54 100644 --- a/l2jserver2-tools/src/main/java/com/l2jserver/model/template/NPCTemplateConverter.java +++ b/l2jserver2-tools/src/main/java/com/l2jserver/model/template/npc/NPCTemplateConverter.java @@ -1,20 +1,20 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ -package com.l2jserver.model.template; +package com.l2jserver.model.template.npc; import java.io.File; import java.io.FileOutputStream; @@ -46,27 +46,28 @@ import com.l2jserver.model.id.template.ItemTemplateID; import com.l2jserver.model.id.template.NPCTemplateID; import com.l2jserver.model.id.template.SkillTemplateID; import com.l2jserver.model.id.template.TeleportationTemplateID; -import com.l2jserver.model.template.NPCTemplate.DropItemMetadata; -import com.l2jserver.model.template.NPCTemplate.DropItemMetadata.DropCategory; -import com.l2jserver.model.template.NPCTemplate.NPCInformationMetadata; -import com.l2jserver.model.template.NPCTemplate.NPCInformationMetadata.CollisionMetadata; -import com.l2jserver.model.template.NPCTemplate.NPCInformationMetadata.ItemMetadata; -import com.l2jserver.model.template.NPCTemplate.NPCInformationMetadata.NPCNameMetadata; -import com.l2jserver.model.template.NPCTemplate.NPCInformationMetadata.NPCStatsMetadata; -import com.l2jserver.model.template.NPCTemplate.NPCInformationMetadata.NPCStatsMetadata.AttackMetadata; -import com.l2jserver.model.template.NPCTemplate.NPCInformationMetadata.NPCStatsMetadata.AttackMetadata.AttackValueMetadata; -import com.l2jserver.model.template.NPCTemplate.NPCInformationMetadata.NPCStatsMetadata.BaseMetadata; -import com.l2jserver.model.template.NPCTemplate.NPCInformationMetadata.NPCStatsMetadata.DefenseMetadata; -import com.l2jserver.model.template.NPCTemplate.NPCInformationMetadata.NPCStatsMetadata.DefenseMetadata.DefenseValueMetadata; -import com.l2jserver.model.template.NPCTemplate.NPCInformationMetadata.NPCStatsMetadata.MoveMetadata; -import com.l2jserver.model.template.NPCTemplate.NPCInformationMetadata.NPCStatsMetadata.Stat; -import com.l2jserver.model.template.NPCTemplate.NPCInformationMetadata.NPCTitleMetadata; -import com.l2jserver.model.template.NPCTemplate.SkillMetadata; -import com.l2jserver.model.template.NPCTemplate.TalkMetadata; -import com.l2jserver.model.template.NPCTemplate.TalkMetadata.Chat; -import com.l2jserver.model.template.TeleportationTemplate.TeleportRestriction; import com.l2jserver.model.template.actor.ActorSex; import com.l2jserver.model.template.npc.NPCRace; +import com.l2jserver.model.template.npc.NPCTemplate; +import com.l2jserver.model.template.npc.NPCTemplate.DropItemMetadata; +import com.l2jserver.model.template.npc.NPCTemplate.NPCInformationMetadata; +import com.l2jserver.model.template.npc.NPCTemplate.SkillMetadata; +import com.l2jserver.model.template.npc.NPCTemplate.TalkMetadata; +import com.l2jserver.model.template.npc.NPCTemplate.DropItemMetadata.DropCategory; +import com.l2jserver.model.template.npc.NPCTemplate.NPCInformationMetadata.CollisionMetadata; +import com.l2jserver.model.template.npc.NPCTemplate.NPCInformationMetadata.ItemMetadata; +import com.l2jserver.model.template.npc.NPCTemplate.NPCInformationMetadata.NPCNameMetadata; +import com.l2jserver.model.template.npc.NPCTemplate.NPCInformationMetadata.NPCStatsMetadata; +import com.l2jserver.model.template.npc.NPCTemplate.NPCInformationMetadata.NPCTitleMetadata; +import com.l2jserver.model.template.npc.NPCTemplate.NPCInformationMetadata.NPCStatsMetadata.AttackMetadata; +import com.l2jserver.model.template.npc.NPCTemplate.NPCInformationMetadata.NPCStatsMetadata.BaseMetadata; +import com.l2jserver.model.template.npc.NPCTemplate.NPCInformationMetadata.NPCStatsMetadata.DefenseMetadata; +import com.l2jserver.model.template.npc.NPCTemplate.NPCInformationMetadata.NPCStatsMetadata.MoveMetadata; +import com.l2jserver.model.template.npc.NPCTemplate.NPCInformationMetadata.NPCStatsMetadata.Stat; +import com.l2jserver.model.template.npc.NPCTemplate.NPCInformationMetadata.NPCStatsMetadata.AttackMetadata.AttackValueMetadata; +import com.l2jserver.model.template.npc.NPCTemplate.NPCInformationMetadata.NPCStatsMetadata.DefenseMetadata.DefenseValueMetadata; +import com.l2jserver.model.template.npc.NPCTemplate.TalkMetadata.Chat; +import com.l2jserver.model.template.npc.TeleportationTemplate.TeleportRestriction; import com.l2jserver.model.world.npc.controller.BaseNPCController; import com.l2jserver.model.world.npc.controller.MonsterController; import com.l2jserver.model.world.npc.controller.NPCController; diff --git a/l2jserver2-tools/src/main/java/com/l2jserver/tool/CharacterSQLEnumGenerator.java b/l2jserver2-tools/src/main/java/com/l2jserver/tool/CharacterSQLEnumGenerator.java index 2a0871345..94fe7a9ec 100644 --- a/l2jserver2-tools/src/main/java/com/l2jserver/tool/CharacterSQLEnumGenerator.java +++ b/l2jserver2-tools/src/main/java/com/l2jserver/tool/CharacterSQLEnumGenerator.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.tool; diff --git a/l2jserver2-tools/src/main/java/com/l2jserver/tool/EndianessTest.java b/l2jserver2-tools/src/main/java/com/l2jserver/tool/EndianessTest.java index d5bba02b5..f74c2e3bc 100644 --- a/l2jserver2-tools/src/main/java/com/l2jserver/tool/EndianessTest.java +++ b/l2jserver2-tools/src/main/java/com/l2jserver/tool/EndianessTest.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.tool; diff --git a/l2jserver2-tools/src/main/java/com/l2jserver/tool/conversor/itemtemplate/ItemListXml.java b/l2jserver2-tools/src/main/java/com/l2jserver/tool/conversor/itemtemplate/ItemListXml.java index d111de5c6..6505cd8ab 100644 --- a/l2jserver2-tools/src/main/java/com/l2jserver/tool/conversor/itemtemplate/ItemListXml.java +++ b/l2jserver2-tools/src/main/java/com/l2jserver/tool/conversor/itemtemplate/ItemListXml.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.tool.conversor.itemtemplate; diff --git a/l2jserver2-tools/src/main/java/com/l2jserver/tool/conversor/itemtemplate/ItemSetXml.java b/l2jserver2-tools/src/main/java/com/l2jserver/tool/conversor/itemtemplate/ItemSetXml.java index 436a03c1d..8102f8a0f 100644 --- a/l2jserver2-tools/src/main/java/com/l2jserver/tool/conversor/itemtemplate/ItemSetXml.java +++ b/l2jserver2-tools/src/main/java/com/l2jserver/tool/conversor/itemtemplate/ItemSetXml.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.tool.conversor.itemtemplate; diff --git a/l2jserver2-tools/src/main/java/com/l2jserver/tool/conversor/itemtemplate/ItemTemplateConversor.java b/l2jserver2-tools/src/main/java/com/l2jserver/tool/conversor/itemtemplate/ItemTemplateConversor.java index be6d185d5..be0ed63e7 100644 --- a/l2jserver2-tools/src/main/java/com/l2jserver/tool/conversor/itemtemplate/ItemTemplateConversor.java +++ b/l2jserver2-tools/src/main/java/com/l2jserver/tool/conversor/itemtemplate/ItemTemplateConversor.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.tool.conversor.itemtemplate; diff --git a/l2jserver2-tools/src/main/java/com/l2jserver/tool/conversor/itemtemplate/ItemValueXml.java b/l2jserver2-tools/src/main/java/com/l2jserver/tool/conversor/itemtemplate/ItemValueXml.java index 3da373f68..a2cc1e5c2 100644 --- a/l2jserver2-tools/src/main/java/com/l2jserver/tool/conversor/itemtemplate/ItemValueXml.java +++ b/l2jserver2-tools/src/main/java/com/l2jserver/tool/conversor/itemtemplate/ItemValueXml.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.tool.conversor.itemtemplate; diff --git a/l2jserver2-tools/src/main/java/com/l2jserver/tool/conversor/itemtemplate/ItemXml.java b/l2jserver2-tools/src/main/java/com/l2jserver/tool/conversor/itemtemplate/ItemXml.java index dbb71a25f..c8ca3f8cc 100644 --- a/l2jserver2-tools/src/main/java/com/l2jserver/tool/conversor/itemtemplate/ItemXml.java +++ b/l2jserver2-tools/src/main/java/com/l2jserver/tool/conversor/itemtemplate/ItemXml.java @@ -1,18 +1,18 @@ /* - * This file is part of l2jserver . + * This file is part of l2jserver2 . * - * l2jserver is free software: you can redistribute it and/or modify + * l2jserver2 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * l2jserver is distributed in the hope that it will be useful, + * l2jserver2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . + * along with l2jserver2. If not, see . */ package com.l2jserver.tool.conversor.itemtemplate; diff --git a/l2jserver2-tools/src/main/java/com/l2jserver/tool/xml/TemplateSchemaGeneratorMain.java b/l2jserver2-tools/src/main/java/com/l2jserver/tool/xml/TemplateSchemaGeneratorMain.java index af835ccca..17bf44f2b 100644 --- a/l2jserver2-tools/src/main/java/com/l2jserver/tool/xml/TemplateSchemaGeneratorMain.java +++ b/l2jserver2-tools/src/main/java/com/l2jserver/tool/xml/TemplateSchemaGeneratorMain.java @@ -8,10 +8,10 @@ import javax.xml.bind.SchemaOutputResolver; import javax.xml.transform.Result; import javax.xml.transform.stream.StreamResult; -import com.l2jserver.model.template.CharacterTemplate; -import com.l2jserver.model.template.ItemTemplate; -import com.l2jserver.model.template.NPCTemplate; import com.l2jserver.model.template.SkillTemplate; +import com.l2jserver.model.template.character.CharacterTemplate; +import com.l2jserver.model.template.item.ItemTemplate; +import com.l2jserver.model.template.npc.NPCTemplate; import com.l2jserver.service.game.template.XMLTemplateService.TeleportationTemplateContainer; public class TemplateSchemaGeneratorMain {